diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
index 908500eabd..54960043bc 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/role/FilePlanRoleServiceImpl.java
@@ -663,7 +663,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
             {
                 String capabilityName = permission.getPermission();
                 Capability capability = capabilityService.getCapability(capabilityName);
-                if (capability != null)
+                if (capability != null && !capability.isPrivate())
                 {
                     capabilities.add(capability);
                 }
@@ -860,7 +860,7 @@ public class FilePlanRoleServiceImpl implements FilePlanRoleService,
                 {
                     throw new AlfrescoRuntimeException("Can not get authorities for role " + roleName + ", because it does not exist. (filePlan=" + filePlan.toString() + ")");
                 }
-                return authorityService.getContainedAuthorities(authorityType, role.getRoleGroupName(), false);
+                return authorityService.getContainedAuthorities(authorityType, role.getRoleGroupName(), true);
             }
         }, AuthenticationUtil.getSystemUserName());
 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RoleDeclarativeWebScript.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RoleDeclarativeWebScript.java
index 819615b5f5..f898cfa74f 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RoleDeclarativeWebScript.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/admin/RoleDeclarativeWebScript.java
@@ -29,6 +29,7 @@ import org.alfresco.module.org_alfresco_module_rm.role.Role;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.AuthorityType;
 import org.apache.cxf.common.util.StringUtils;
 import org.springframework.extensions.webscripts.DeclarativeWebScript;
 import org.springframework.extensions.webscripts.WebScriptRequest;
@@ -172,7 +173,11 @@ public class RoleDeclarativeWebScript extends DeclarativeWebScript
 
         for (String authority : authorities)
         {
-            String displayLabel = authorityService.getAuthorityDisplayName(authority);
+            String displayLabel = authority;
+            if (!AuthorityType.getAuthorityType(authority).equals(AuthorityType.USER))
+            {
+                displayLabel = authorityService.getAuthorityDisplayName(authority);
+            }
             result.add(new AuthorityItem(authority, displayLabel));
         }