diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
index c5d91d36dd..a05c42d22f 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/module-context.xml
@@ -60,7 +60,6 @@
             <value>alfresco.module.org_alfresco_module_rm.messages.dataset-service</value>
             <value>alfresco.module.org_alfresco_module_rm.messages.rm-system</value>
             <value>alfresco.module.org_alfresco_module_rm.messages.template</value>
-            <value>alfresco.module.org_alfresco_module_rm.messages.rm-classification</value>
          </list>
       </property>
    </bean>
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-classified-records-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-classified-records-context.xml
index 88a727cdc9..72f95bb85b 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-classified-records-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-classified-records-context.xml
@@ -41,10 +41,8 @@
    <bean id="ClassificationService_security" parent="baseSecurity">
       <property name="objectDefinitionSource">
          <value>
-            <![CDATA[
-               org.alfresco.module.org_alfresco_module_rm.classification.ClassificationService.getClassificationLevels=RM_ALLOW
-               org.alfresco.module.org_alfresco_module_rm.classification.ClassificationService.*=RM_DENY
-            ]]>
+            org.alfresco.module.org_alfresco_module_rm.classification.ClassificationService.getClassificationLevels=ACL_ALLOW
+            org.alfresco.module.org_alfresco_module_rm.classification.ClassificationService.*=ACL_DENY
          </value>
       </property>
    </bean>
@@ -55,4 +53,12 @@
        <constructor-arg ref="classificationService"/> <!-- Intentionally using the small 'c' here -->
        <constructor-arg ref="TransactionService"/>
    </bean>
+
+   <bean id="rmClassificationResourceBundles" class="org.alfresco.i18n.ResourceBundleBootstrapComponent">
+      <property name="resourceBundles">
+         <list>
+            <value>alfresco.module.org_alfresco_module_rm.messages.rm-classification</value>
+         </list>
+      </property>
+   </bean>
 </beans>
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationService.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationService.java
index 3e93c95943..e2393986bd 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationService.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationService.java
@@ -36,5 +36,5 @@ public interface ClassificationService
      *         (where fewer users have access to the highest classification levels
      *         and therefore access to the most restricted documents).
      */
-    public List<ClassificationLevel> getClassificationLevels();
+    List<ClassificationLevel> getClassificationLevels();
 }
diff --git a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceImplUnitTest.java b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceImplUnitTest.java
index b31eb83806..64d2c41b9c 100644
--- a/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceImplUnitTest.java
+++ b/rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/classification/ClassificationServiceImplUnitTest.java
@@ -28,8 +28,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
 
 /**
  * Unit tests for {@link ClassificationServiceImpl}.