diff --git a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
index 18283d22aa..8a0dba0797 100644
--- a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
+++ b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
@@ -240,12 +240,12 @@ public final class AuthenticationHelper
             setUsernameCookie(req, res, loginBean.getUsernameInternal());
          }
          
-         // Set the current locale
-         I18NUtil.setLocale(Application.getLanguage(req.getSession()));
-         
          // setup faces context
          FacesHelper.getFacesContext(req, res, sc);
          
+         // Set the current locale
+         I18NUtil.setLocale(Application.getLanguage(req.getSession()));
+         
          if (loginBean != null && (loginBean.getUserPreferencesBean() != null))
          {
             String contentFilterLanguageStr = loginBean.getUserPreferencesBean().getContentFilterLanguage();