diff --git a/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java b/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
index ea5acf8fbc..ceec3c8cb5 100644
--- a/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
+++ b/source/java/org/alfresco/opencmis/AlfrescoCmisServiceImpl.java
@@ -1795,6 +1795,7 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
             public void beforeProcess() throws Throwable
             {
                 // Authentication
+                AuthenticationUtil.pushAuthentication();
                 AuthenticationUtil.setFullyAuthenticatedUser(runAsUser);
             }
 
@@ -1802,7 +1803,7 @@ public class AlfrescoCmisServiceImpl extends AbstractCmisService implements Alfr
             public void afterProcess() throws Throwable
             {
                 // Clear authentication
-                AuthenticationUtil.clearCurrentSecurityContext();
+                AuthenticationUtil.popAuthentication();
             }
         };