diff --git a/config/alfresco/action-services-context.xml b/config/alfresco/action-services-context.xml
index 8807738d60..a30daf4ee0 100644
--- a/config/alfresco/action-services-context.xml
+++ b/config/alfresco/action-services-context.xml
@@ -335,9 +335,6 @@
-
-
- false
diff --git a/source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java b/source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java
index 15b828822e..45bb74e79d 100644
--- a/source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java
+++ b/source/java/org/alfresco/repo/coci/CheckOutCheckInServiceImpl.java
@@ -444,6 +444,9 @@ public class CheckOutCheckInServiceImpl implements CheckOutCheckInService
}
}, AuthenticationUtil.getSystemUserName());
+ // Get the user
+ String userName = getUserName();
+
ruleService.disableRules();
try
{
@@ -459,9 +462,6 @@ public class CheckOutCheckInServiceImpl implements CheckOutCheckInService
{
ruleService.enableRules();
}
-
- // Get the user
- String userName = getUserName();
// Lock the original node
this.lockService.lock(nodeRef, LockType.READ_ONLY_LOCK);