diff --git a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
index 13c8faa294..2d540804e7 100644
--- a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
+++ b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
@@ -18,7 +18,6 @@ package org.alfresco.web.app.servlet;
 
 import java.io.IOException;
 import java.util.Enumeration;
-import java.util.Locale;
 
 import javax.portlet.PortletSession;
 import javax.servlet.ServletContext;
@@ -229,8 +228,13 @@ public final class AuthenticationHelper
             String contentFilterLanguageStr = loginBean.getUserPreferencesBean().getContentFilterLanguage();
             if (contentFilterLanguageStr != null)
             {
-               //set the cocale for the method interceptor for MLText properties
-               I18NUtil.setContentLocale(new Locale(contentFilterLanguageStr));
+               // Set the locale for the method interceptor for MLText properties
+               I18NUtil.setContentLocale(I18NUtil.parseLocale(contentFilterLanguageStr));
+            }
+            else
+            {
+               // Nothing has been selected, so remove the content filter
+               I18NUtil.setContentLocale(null);
             }
          }
 
diff --git a/source/java/org/alfresco/web/bean/UserPreferencesBean.java b/source/java/org/alfresco/web/bean/UserPreferencesBean.java
index 8b08f2ad81..143005658d 100644
--- a/source/java/org/alfresco/web/bean/UserPreferencesBean.java
+++ b/source/java/org/alfresco/web/bean/UserPreferencesBean.java
@@ -99,7 +99,7 @@ public class UserPreferencesBean
    }
    
    /**
-    * @return current content filter language
+    * @return current content filter language, or <tt>null</tt> if all languages was selected
     */
    public String getContentFilterLanguage()
    {
@@ -116,7 +116,7 @@ public class UserPreferencesBean
               this.contentFilterLanguage = locale.toString();
           }
       }
-      return contentFilterLanguage;
+      return (contentFilterLanguage.equals(MSG_CONTENTALLLANGUAGES)) ? null : contentFilterLanguage;
    }
    
    /**