Index: lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java
===================================================================
diff -u -rb2335f2cd96aebbe2a8048bbd6995a9abae6ed3d -r1e7487d0fb9d2b078e4f73379b4feac6ea122fb6
--- lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java	(.../LocaleFilter.java)	(revision b2335f2cd96aebbe2a8048bbd6995a9abae6ed3d)
+++ lams_common/src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java	(.../LocaleFilter.java)	(revision 1e7487d0fb9d2b078e4f73379b4feac6ea122fb6)
@@ -35,6 +35,8 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.context.i18n.LocaleContextHolder;
@@ -89,17 +91,15 @@
 				}
 			}
     	}
-//		if(preferredLocale == null){
-//        	//if request does not have, set it default then.
-//        	preferredLocale = new Locale(DEFAULT_LANGUAGE,DEFUALT_COUNTRY);
-//		}
+		if(preferredLocale == null){
+        	//if request does not have, set it default then.
+        	preferredLocale = new Locale(Configuration.get(ConfigurationKeys.SERVER_LANGUAGE));
+		}
 
     	HttpSession session = request.getSession(false);
         //set locale for STURTS and JSTL
         if (session != null) {
-            if (preferredLocale == null) {
-                preferredLocale = (Locale) session.getAttribute(PREFERRED_LOCALE_KEY);
-            } else {
+            if (preferredLocale != null) {
                 session.setAttribute(PREFERRED_LOCALE_KEY, preferredLocale);
                 Config.set(session, Config.FMT_LOCALE, preferredLocale);
             }