diff --git a/source/java/org/alfresco/repo/avm/AVMStoreImpl.java b/source/java/org/alfresco/repo/avm/AVMStoreImpl.java
index a331b2820b..eb7614ef8c 100644
--- a/source/java/org/alfresco/repo/avm/AVMStoreImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMStoreImpl.java
@@ -105,7 +105,12 @@ public class AVMStoreImpl implements AVMStore, Serializable
         fNextVersionID = 0;
         fRoot = null;
         AVMContext.fgInstance.fAVMStoreDAO.save(this);
-        setProperty(ContentModel.PROP_CREATOR, new PropertyValue(null, "britt"));
+        String creator = AVMContext.fgInstance.getAuthenticationComponent().getCurrentUserName();
+        if (creator == null)
+        {
+            creator = AVMContext.fgInstance.getAuthenticationComponent().getSystemUserName();
+        }
+        setProperty(ContentModel.PROP_CREATOR, new PropertyValue(null, creator));
         setProperty(ContentModel.PROP_CREATED, new PropertyValue(null, new Date(System.currentTimeMillis())));
         // Make up the initial version record and save.
         long time = System.currentTimeMillis();
@@ -116,7 +121,7 @@ public class AVMStoreImpl implements AVMStore, Serializable
                                                       fRoot,
                                                       fNextVersionID,
                                                       time,
-                                                      "britt");
+                                                      creator);
         fNextVersionID++;
         AVMContext.fgInstance.fVersionRootDAO.save(versionRoot);
     }
diff --git a/source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java b/source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java
index b7f9e73b82..ec81e10aa7 100644
--- a/source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMSyncServiceImpl.java
@@ -19,10 +19,8 @@ package org.alfresco.repo.avm;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.alfresco.service.cmr.avm.AVMBadArgumentException;
 import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
@@ -113,7 +111,6 @@ public class AVMSyncServiceImpl implements AVMSyncService
         return result;
     }
     
-    // TODO We need getDirectlyListingDirect(descriptor, includeDeleted)
     /**
      * Internal recursive implementation of compare.
      * @param srcVersion The version of the source tree.