Index: lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java
===================================================================
diff -u -r70a60f2862830ca6bd07e2b1252af3d79e4939af -r86672fe96b38e26e8e4641e91227f3d1c0bc7442
--- lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java	(.../LanguageUtil.java)	(revision 70a60f2862830ca6bd07e2b1252af3d79e4939af)
+++ lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java	(.../LanguageUtil.java)	(revision 86672fe96b38e26e8e4641e91227f3d1c0bc7442)
@@ -29,8 +29,6 @@
 import java.util.Map;
 import java.util.TimeZone;
 
-import javax.servlet.ServletContext;
-
 import org.apache.commons.lang.StringUtils;
 import org.lamsfoundation.lams.usermanagement.SupportedLocale;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
@@ -56,13 +54,16 @@
 
     private static IUserManagementService getService() {
 	if (service == null) {
-	    ServletContext context = HttpSessionManager.getInstance().getServletContext();
 	    WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(HttpSessionManager
 		    .getInstance().getServletContext());
 	    service = (IUserManagementService) ctx.getBean("userManagementService");
 	}
 	return service;
     }
+    
+    public static void setService(IUserManagementService service) {
+	LanguageUtil.service = service;
+    }
 
     /**
      * Get the default language, country, based on entries in the server