Index: trunk/packages/sipb-xen-www/code/main.py
===================================================================
--- trunk/packages/sipb-xen-www/code/main.py	(revision 572)
+++ trunk/packages/sipb-xen-www/code/main.py	(revision 573)
@@ -358,5 +358,4 @@
         validate = validation.Validate(username, state, **kws)
         machine = validate.machine
-        print >> sys.stderr, machine, machine.administrator, kws['admin']
         oldname = machine.name
 
Index: trunk/packages/sipb-xen-www/code/validation.py
===================================================================
--- trunk/packages/sipb-xen-www/code/validation.py	(revision 572)
+++ trunk/packages/sipb-xen-www/code/validation.py	(revision 573)
@@ -228,5 +228,5 @@
         return owner
     if machine is not None and owner in (machine.owner, None):
-        return None
+        return machine.owner
     if owner is None:
         raise InvalidInput('owner', owner, "Owner must be specified")