diff --git a/source/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java b/source/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java
index 96d25455c1..39346d9d74 100644
--- a/source/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java
+++ b/source/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java
@@ -921,6 +921,20 @@ public class PermissionModel implements ModelDAO, InitializingBean
         permissionReferenceMap = new HashMap<String, PermissionReference>();
         permissionGroupMap = new HashMap<PermissionReference, PermissionGroup>();
         permissionMap = new HashMap<PermissionReference, Permission>();
+        for (PermissionSet ps : permissionSets.values())
+        {
+            for (PermissionGroup pg : ps.getPermissionGroups())
+            {
+            	  permissionGroupMap.put(pg, pg);
+            	  permissionReferenceMap.put(pg.toString(), pg);
+            }
+            for (Permission p : ps.getPermissions())
+            {
+            	permissionReferenceMap.put(p.toString(), p);
+                permissionMap.put(p, p);
+            }
+        }
+        
         for (PermissionSet ps : permissionSets.values())
         {
             for (PermissionGroup pg : ps.getPermissionGroups())
@@ -938,8 +952,6 @@ public class PermissionModel implements ModelDAO, InitializingBean
                 {
                     uniqueMap.put(pg.getName(), getBasePermissionGroup(pg));
                 }
-                permissionReferenceMap.put(pg.toString(), pg);
-                permissionGroupMap.put(pg, pg);
             }
             for (Permission p : ps.getPermissions())
             {
@@ -956,8 +968,6 @@ public class PermissionModel implements ModelDAO, InitializingBean
                 {
                     uniqueMap.put(p.getName(), p);
                 }
-                permissionReferenceMap.put(p.toString(), p);
-                permissionMap.put(p, p);
             }
         }
         // Add all permissions to the unique list