Index: trunk/packages/invirt-web/code/cache_acls.py
===================================================================
--- trunk/packages/invirt-web/code/cache_acls.py	(revision 1708)
+++ trunk/packages/invirt-web/code/cache_acls.py	(revision 1709)
@@ -43,5 +43,6 @@
     people = set()
     people.update(expandLocker(m.owner))
-    people.update(expandName(m.administrator))
+    if m.administrator is not None:
+        people.update(expandName(m.administrator))
     return people
 
Index: trunk/packages/invirt-web/code/controls.py
===================================================================
--- trunk/packages/invirt-web/code/controls.py	(revision 1708)
+++ trunk/packages/invirt-web/code/controls.py	(revision 1709)
@@ -91,5 +91,5 @@
         machine.memory = memory
         machine.owner = owner
-        machine.administrator = owner
+        machine.administrator = None
         machine.contact = contact
         machine.uuid = uuidToString(randomUUID())
Index: trunk/packages/invirt-web/code/validation.py
===================================================================
--- trunk/packages/invirt-web/code/validation.py	(revision 1708)
+++ trunk/packages/invirt-web/code/validation.py	(revision 1709)
@@ -45,7 +45,5 @@
         if owner is not None:
             self.owner = owner
-        admin = testAdmin(username, admin, machine)
-        if admin is not None:
-            self.admin = admin
+        self.admin = testAdmin(username, admin, machine)
         contact = testContact(username, contact, machine)
         if contact is not None:
@@ -219,5 +217,5 @@
         return None
     if machine is not None and admin == machine.administrator:
-        return None
+        return admin
     if admin == user:
         return admin