diff --git a/config/alfresco/web-client-application-context.xml b/config/alfresco/web-client-application-context.xml
index ca3bfadd15..8b0bf2fcab 100644
--- a/config/alfresco/web-client-application-context.xml
+++ b/config/alfresco/web-client-application-context.xml
@@ -7,7 +7,7 @@
    <!-- Web Script Beans                      -->
    <!-- ===================================== -->
 
-   <!--  Alfresco Web Client Authenticator (Servlet based) -->
+   <!--  Alfresco Web Client Authenticator (Servlet based - Session) -->
    <bean id="webscripts.authenticator.webclient" class="org.alfresco.repo.web.scripts.servlet.WebClientAuthenticatorFactory" />
    
    <bean id="webscripts.authenticator.jsr168.webclient" class="org.alfresco.repo.web.scripts.portlet.WebClientPortletAuthenticatorFactory" lazy-init="true"/>
diff --git a/source/java/org/alfresco/repo/web/scripts/servlet/WebClientAuthenticatorFactory.java b/source/java/org/alfresco/repo/web/scripts/servlet/WebClientAuthenticatorFactory.java
index 160910df62..0723988006 100644
--- a/source/java/org/alfresco/repo/web/scripts/servlet/WebClientAuthenticatorFactory.java
+++ b/source/java/org/alfresco/repo/web/scripts/servlet/WebClientAuthenticatorFactory.java
@@ -41,6 +41,10 @@ import org.springframework.web.context.ServletContextAware;
 /**
  * Alfresco Web Client Authentication
  * 
+ * NOTE: 5.0 - Explorer client has been removed - as have the JSF bean definitions. This effectively mean this is now just
+ *       a web Session based authenticator - ticket and user wrapper is stored in a Session and the JSESSIONID cookie is returned.
+ *       No user prefs for language etc. are set due to the removal of Explorer beans. 
+ * 
  * @author davidc
  */
 public class WebClientAuthenticatorFactory implements ServletAuthenticatorFactory, ServletContextAware
@@ -179,6 +183,12 @@ public class WebClientAuthenticatorFactory implements ServletAuthenticatorFactor
         {
             return (ticket == null || ticket.length() == 0);
         }
+        
+        @Override
+        public String toString()
+        {
+            return servletReq.toString() + " [ticket=" + ticket + "]";
+        }
     }
 
 }
\ No newline at end of file
diff --git a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
index 491adc1102..0f51878b33 100644
--- a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
+++ b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
@@ -587,7 +587,7 @@ public final class AuthenticationHelper
             if (sessionUser instanceof User)
             {
                user = (User)sessionUser;
-               setExternalAuth(session, userId != null);                  
+               setExternalAuth(session, userId != null);
             }
             else
             {
@@ -654,7 +654,7 @@ public final class AuthenticationHelper
                       logger.debug("Invalidating the session.");
                   session.invalidate();
                }
-            }            
+            }
          }
       }
       return user;
diff --git a/source/java/org/alfresco/web/bean/repository/User.java b/source/java/org/alfresco/web/bean/repository/User.java
index 685d2d87c2..48092826e1 100644
--- a/source/java/org/alfresco/web/bean/repository/User.java
+++ b/source/java/org/alfresco/web/bean/repository/User.java
@@ -312,4 +312,10 @@ public final class User implements SessionUser
       
       return nameAndId.toString();
    }
+   
+   @Override
+   public String toString()
+   {
+       return this.userName;
+   }
 }
diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml
index 5921c40f32..b601d1751f 100644
--- a/source/web/WEB-INF/web.xml
+++ b/source/web/WEB-INF/web.xml
@@ -288,7 +288,7 @@
       <servlet-class>org.springframework.extensions.webscripts.servlet.WebScriptServlet</servlet-class>
       <init-param>
          <param-name>authenticator</param-name>
-         <param-value>webscripts.authenticator.basic</param-value>
+         <param-value>webscripts.authenticator.remoteuser</param-value>
       </init-param>
    </servlet>