diff --git a/config/alfresco/bootstrap/system.xml b/config/alfresco/bootstrap/system.xml
index 428044ad94..22d98f99c4 100644
--- a/config/alfresco/bootstrap/system.xml
+++ b/config/alfresco/bootstrap/system.xml
@@ -16,7 +16,7 @@
                         <cm:homeFolder>/${spaces.company_home.childname}</cm:homeFolder>
                     </cm:person>
                     <cm:person view:childName="cm:person">
-                        <cm:userName>Guest</cm:userName>
+                        <cm:userName>guest</cm:userName>
                         <cm:firstName>Guest</cm:firstName>
                         <cm:lastName></cm:lastName>
                         <cm:email></cm:email>
diff --git a/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java b/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java
index f686cd9943..ba33b63541 100644
--- a/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java
+++ b/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java
@@ -425,7 +425,6 @@ public class PermissionServiceImpl implements PermissionServiceSPI, Initializing
         // TODO: Refactor and use the authentication service for this.
         User user = (User) auth.getPrincipal();
         auths.add(user.getUsername());
-        auths.add(getAllAuthorities());
         for (GrantedAuthority authority : auth.getAuthorities())
         {
             auths.add(authority.getAuthority());
diff --git a/source/java/org/alfresco/repo/security/person/PersonTest.java b/source/java/org/alfresco/repo/security/person/PersonTest.java
index 09e09261e3..4d4cad853d 100644
--- a/source/java/org/alfresco/repo/security/person/PersonTest.java
+++ b/source/java/org/alfresco/repo/security/person/PersonTest.java
@@ -65,6 +65,51 @@ public class PersonTest extends BaseSpringTest
         flushAndClear();
     }
 
+    public void xtestPerformance()
+    {
+        personService.setCreateMissingPeople(false);
+        
+        personService.createPerson(createDefaultProperties("derek", "Derek", "Hulley", "dh@dh",
+                "alfresco", rootNodeRef));
+        
+        
+        
+        long create = 0;
+        long count = 0;
+       
+        long start;
+        long end;
+        
+        for(int i = 0; i < 10000; i++)
+        {
+            String id = "TestUser-"+i;
+            start = System.nanoTime();
+            personService.createPerson(createDefaultProperties(id, id, id, id,
+                    id, rootNodeRef));
+            end = System.nanoTime();
+            create += (end - start);
+            
+            if((i > 0) && (i % 100 == 0))
+            {
+                System.out.println("Count = "+i);
+                System.out.println("Average create : "+(create/i/1000000.0f));
+                start = System.nanoTime();
+                personService.personExists(id);
+                end = System.nanoTime();
+                System.out.println("Exists : "+((end-start)/1000000.0f));
+                
+                start = System.nanoTime();
+                int size = personService.getAllPeople().size();
+                end = System.nanoTime();
+                System.out.println("Size ("+size+") : "+((end-start)/1000000.0f));
+            }
+        }
+       
+        
+        
+        
+    }
+    
     public void testCreateMissingPeople1()
     {
         personService.setCreateMissingPeople(false);
diff --git a/source/java/org/alfresco/service/cmr/security/AuthorityType.java b/source/java/org/alfresco/service/cmr/security/AuthorityType.java
index b7ad08cedc..63b2821d8e 100644
--- a/source/java/org/alfresco/service/cmr/security/AuthorityType.java
+++ b/source/java/org/alfresco/service/cmr/security/AuthorityType.java
@@ -219,7 +219,7 @@ public enum AuthorityType
         {
             authorityType = AuthorityType.OWNER;
         }
-        else if (authority.equals(PermissionService.GUEST))
+        else if (authority.equalsIgnoreCase(PermissionService.GUEST))
         {
             authorityType = AuthorityType.GUEST;
         }