diff --git a/source/java/org/alfresco/web/bean/UserPreferencesBean.java b/source/java/org/alfresco/web/bean/UserPreferencesBean.java
index b70c62a7e7..998ed1b8ed 100644
--- a/source/java/org/alfresco/web/bean/UserPreferencesBean.java
+++ b/source/java/org/alfresco/web/bean/UserPreferencesBean.java
@@ -96,7 +96,10 @@ public class UserPreferencesBean
    public void setLanguage(String language)
    {
       this.language = language;
-      Application.setLanguage(FacesContext.getCurrentInstance(), this.language);
+      Application.setLanguage(FacesContext.getCurrentInstance(), language);
+      
+      // Set the current locale in the server
+      I18NUtil.setLocale(I18NUtil.parseLocale(language));
    }
    
    /**