diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
index 0312f6512b..407699cbff 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-group-context.xml
@@ -141,6 +141,5 @@
     			<ref bean="rmFileRecordsCapability"/>
     		</list>
     	</property>
-    </bean>
-
+    </bean> 
 </beans>
\ No newline at end of file
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
index a636762d31..0f381d7dd9 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-capabilities-context.xml
@@ -169,17 +169,18 @@
 		<property name="permission" value="ManageAccessControls" />
 	</bean>
 
-    <bean id="rmManageAccessRightsCapability" 
-    	  parent="declarativeCapability">
-   		<property name="name" value="ManageAccessRights"/>
-   		<property name="permission" value="ManageAccessRights"/>   		
-   		<property name="conditions">
-   			<map>
-   				<entry key="capabilityCondition.frozen" value="false"/>   	
-   			</map>
-   		</property>
-    </bean>  
-    
+    <bean id="rmManageAccessRightsCapability"
+          parent="declarativeCapability">
+        <property name="name" value="ManageAccessRights"/>
+        <property name="permission" value="ManageAccessRights"/>
+        <property name="conditions">
+            <map>
+                <entry key="capabilityCondition.frozen" value="false"/>
+                <entry key="capabilityCondition.filling" value="true"/>
+            </map>
+        </property>
+    </bean>
+
     <bean id="rmMapClassificationGuideMetadataCapability" 
 		  parent="declarativeCapability">
 		<property name="name" value="MapClassificationGuideMetadata" />
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
index 2465f4804d..9bfae278a0 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
@@ -299,20 +299,20 @@
 		</property>	
 		<property name="capability" value="Delete"/>      
 	</bean>	  
-	
-	<bean id="jsonConversionComponent.managePermissionsAction"
-	      parent="jsonConversionComponent.baseAction">
-		<property name="name" value="managePermissions"/>
-		<property name="kinds">
-			<set>
-				<value>RECORD_CATEGORY</value>
-				<value>RECORD_FOLDER</value>
-				<value>RECORD</value>
-			</set>
-		</property>	
-		<property name="capability" value ="ManageAccessRights"/>
-	</bean>
-	
+
+    <bean id="jsonConversionComponent.managePermissionsAction"
+          parent="jsonConversionComponent.baseAction">
+        <property name="name" value="managePermissions"/>
+        <property name="kinds">
+            <set>
+                <value>FILE_PLAN</value>
+                <value>RECORD_CATEGORY</value>
+                <value>RECORD_FOLDER</value>
+            </set>
+        </property>
+        <property name="capability" value ="ManageAccessRights"/>
+    </bean>
+
 	<bean id="jsonConversionComponent.viewAuditLogAction"
 	      parent="jsonConversionComponent.baseAction">
 		<property name="name" value="viewAuditLog"/>
@@ -537,7 +537,7 @@
 		<property name="name" value="export"/>
 		<property name="capability" value="ViewRecords"/>
 	</bean>
-	
+
 	<bean id="jsonConversionComponent.relinquish"
 	      parent="jsonConversionComponent.baseAction">
 		<property name="name" value="relinquish"/>
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RecordsManagementSecurityServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RecordsManagementSecurityServiceImpl.java
index 9c0f85f4c6..d96b2b9330 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RecordsManagementSecurityServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/security/RecordsManagementSecurityServiceImpl.java
@@ -830,9 +830,12 @@ public class RecordsManagementSecurityServiceImpl implements RecordsManagementSe
         AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<Object>()
         {
             public Boolean doWork() throws Exception
-            { 
-                if (recordsManagementService.isFilePlan(nodeRef) == false &&
-                    recordsManagementService.isRecordCategory(nodeRef) == true)
+            {
+                if (recordsManagementService.isFilePlan(nodeRef) == true)
+                {
+                   setPermissionDown(nodeRef, authority, permission);
+                }
+                else if (recordsManagementService.isRecordCategory(nodeRef) == true)
                 {
                     setReadPermissionUp(nodeRef, authority);
                     setPermissionDown(nodeRef, authority, permission);