Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java
===================================================================
diff -u -r18df5a739d3e9dff1734cf64ee63595acff7a71e -r8a3e9e26bd2052212eda725e7c88b681ddd45361
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java	(.../AdminServiceProxy.java)	(revision 18df5a739d3e9dff1734cf64ee63595acff7a71e)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java	(.../AdminServiceProxy.java)	(revision 8a3e9e26bd2052212eda725e7c88b681ddd45361)
@@ -49,18 +49,17 @@
 	
 	public static final IUserManagementService getService(ServletContext servletContext) {
 		if (manageService == null) {
-			return (IUserManagementService)getDomainService(servletContext, "userManagementService");
-		} else {
-			return manageService;
+			manageService = (IUserManagementService)getDomainService(servletContext, "userManagementService");
 		}
+		return manageService;
 	}
 	
 	public static final MessageService getMessageService(ServletContext servletContext) {
 		if (messageService == null) {
-			return (MessageService)getDomainService(servletContext, "adminMessageService");
-		} else {
-			return messageService;
+			messageService = (MessageService)getDomainService(servletContext, "adminMessageService");
 		}
+		return messageService;
+
 	}
 	
 	public static final IIntegrationService getIntegrationService(ServletContext servletContext) {