diff --git a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
index 80994f48ff..13c8faa294 100644
--- a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
+++ b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
@@ -155,23 +155,16 @@ public final class AuthenticationHelper
                   tx.commit();
                   tx = null;     // clear this so we know not to rollback 
                   
-//                  // store the User object in the Session - the authentication servlet will then proceed
-//                  session.setAttribute(AuthenticationHelper.AUTHENTICATION_USER, user);
-//               
-//                  // Set the current locale
-//                  I18NUtil.setLocale(Application.getLanguage(httpRequest.getSession()));
-//                  
-//                  // remove the session invalidated flag
-//                  session.removeAttribute(AuthenticationHelper.SESSION_INVALIDATED);
-
-                  I18NUtil.setLocale(Application.getLanguage(httpRequest.getSession()));
                   // store the User object in the Session - the authentication servlet will then proceed
                   session.setAttribute(AuthenticationHelper.AUTHENTICATION_USER, user);
                
                   // Set the current locale
                   I18NUtil.setLocale(Application.getLanguage(httpRequest.getSession()));
-//                  
-                 // remove the session invalidated flag
+                  
+                  // remove the session invalidated flag
+                  session.removeAttribute(AuthenticationHelper.SESSION_INVALIDATED);
+
+                  // remove the session invalidated flag
                   session.removeAttribute(AuthenticationHelper.SESSION_INVALIDATED);
                   
                   // it is the responsibilty of the caller to handle the Guest return status
diff --git a/source/java/org/alfresco/web/bean/LoginBean.java b/source/java/org/alfresco/web/bean/LoginBean.java
index 46f83788c5..e6242d7a53 100644
--- a/source/java/org/alfresco/web/bean/LoginBean.java
+++ b/source/java/org/alfresco/web/bean/LoginBean.java
@@ -103,7 +103,7 @@ public class LoginBean
    
    public UserPreferencesBean getUserPreferencesBean()
    {
-     return preferences;
+      return preferences;
    }
    
    /**