diff --git a/source/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java b/source/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java
index 9bb7eaf3ea..24e312c518 100644
--- a/source/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java
+++ b/source/java/org/alfresco/repo/web/scripts/portlet/WebClientPortletAuthenticatorFactory.java
@@ -137,7 +137,7 @@ public class WebClientPortletAuthenticatorFactory implements PortletAuthenticato
                     logger.debug("Authenticating as Guest");
                 
                 // authenticate as guest
-                AuthenticationUtil.setCurrentUser(AuthenticationUtil.getGuestUserName());
+                AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getGuestUserName());
     
                 if (logger.isDebugEnabled())
                     logger.debug("Setting Web Client authentication context for guest");
@@ -150,7 +150,7 @@ public class WebClientPortletAuthenticatorFactory implements PortletAuthenticato
                 if (logger.isDebugEnabled())
                     logger.debug("Authenticating as user " + portalUser);
                 
-                AuthenticationUtil.setCurrentUser(portalUser);
+                AuthenticationUtil.setFullyAuthenticatedUser(portalUser);
     
                 // determine if Web Client context needs to be updated
                 User user = getWebClientUser(session);
diff --git a/source/java/org/alfresco/web/app/servlet/MTWebScriptAuthenticationFilter.java b/source/java/org/alfresco/web/app/servlet/MTWebScriptAuthenticationFilter.java
index 4cc85eaf9e..207da11f0a 100644
--- a/source/java/org/alfresco/web/app/servlet/MTWebScriptAuthenticationFilter.java
+++ b/source/java/org/alfresco/web/app/servlet/MTWebScriptAuthenticationFilter.java
@@ -74,7 +74,7 @@ public class MTWebScriptAuthenticationFilter implements Filter
    {
        if (AuthenticationUtil.isMtEnabled())
        {
-           String currentUser = AuthenticationUtil.getCurrentUserName();
+           String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
            if (currentUser == null)
            {
                // retrieve authenticator factory