diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index b6d791a296..c107c12db3 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -1254,7 +1254,7 @@
         <property name="nodeService" ref="NodeService"/>
         <property name="dictionaryService" ref="DictionaryService"/>
         <property name="identifierService" ref="recordsManagementIdentifierService"/>
-        <property name="permissionService" ref="ExtendedPermissionService"/>
+        <property name="extendedPermissionService" ref="ExtendedPermissionService"/>
         <property name="extendedSecurityService" ref="ExtendedSecurityService" />
         <property name="policyComponent" ref="policyComponent" />
         <property name="dispositionService" ref="DispositionService" />
@@ -1267,6 +1267,7 @@
         <property name="recordFolderService" ref="RecordFolderService" />
         <property name="vitalRecordService" ref="VitalRecordService" />
         <property name="filePlanRoleService" ref="FilePlanRoleService" />
+        <property name="permissionService" ref="permissionService" />
     </bean>
 
     <bean id="RecordService" class="org.springframework.aop.framework.ProxyFactoryBean">
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
index e5c86222a4..1b0d1428bd 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
@@ -153,8 +153,8 @@ public class RecordServiceImpl implements RecordService,
     /** Dictionary service */
     private DictionaryService dictionaryService;
 
-    /** Permission service */
-    private ExtendedPermissionService permissionService;
+    /** Extended permission service */
+    private ExtendedPermissionService extendedPermissionService;
 
     /** Extended security service */
     private ExtendedSecurityService extendedSecurityService;
@@ -192,6 +192,9 @@ public class RecordServiceImpl implements RecordService,
     /** File plan role service */
     private FilePlanRoleService filePlanRoleService;
 
+    /** Permission service */
+    private PermissionService permissionService;
+
     /** List of available record meta-data aspects */
     private Set<QName> recordMetaDataAspects;
 
@@ -234,11 +237,11 @@ public class RecordServiceImpl implements RecordService,
     }
 
     /**
-     * @param permissionService permission service
+     * @param extendedPermissionService extended permission service
      */
-    public void setPermissionService(ExtendedPermissionService permissionService)
+    public void setExtendedPermissionService(ExtendedPermissionService extendedPermissionService)
     {
-        this.permissionService = permissionService;
+        this.extendedPermissionService = extendedPermissionService;
     }
 
     /**
@@ -337,6 +340,14 @@ public class RecordServiceImpl implements RecordService,
         this.filePlanRoleService = filePlanRoleService;
     }
 
+    /**
+     * @param permissionService permission service
+     */
+    public void setPermissionService(PermissionService permissionService)
+    {
+        this.permissionService = permissionService;
+    }
+
     /**
      * Init method
      */
@@ -667,7 +678,7 @@ public class RecordServiceImpl implements RecordService,
         ParameterCheck.mandatory("isLinked", isLinked);
 
         // first we do a sanity check to ensure that the user has at least write permissions on the document
-        if (permissionService.hasPermission(nodeRef, PermissionService.WRITE) != AccessStatus.ALLOWED)
+        if (extendedPermissionService.hasPermission(nodeRef, PermissionService.WRITE) != AccessStatus.ALLOWED)
         {
             throw new AccessDeniedException("Can not create record from document, because the user " +
                                             AuthenticationUtil.getFullyAuthenticatedUser() +
@@ -699,8 +710,8 @@ public class RecordServiceImpl implements RecordService,
 
                         // get the documents readers
                         Long aclId = nodeService.getNodeAclId(nodeRef);
-                        Set<String> readers = permissionService.getReaders(aclId);
-                        Set<String> writers = permissionService.getWriters(aclId);
+                        Set<String> readers = extendedPermissionService.getReaders(aclId);
+                        Set<String> writers = extendedPermissionService.getWriters(aclId);
 
                         // add the current owner to the list of extended writers
                         String owner = ownableService.getOwner(nodeRef);