Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java
===================================================================
diff -u -r5afbd7445743e7be55ac2b451e8136c1b2d6b40c -r1aeb1a8e497e3dc07173d5c9da597c491bd352be
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java	(.../OrgManageAction.java)	(revision 5afbd7445743e7be55ac2b451e8136c1b2d6b40c)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java	(.../OrgManageAction.java)	(revision 1aeb1a8e497e3dc07173d5c9da597c491bd352be)
@@ -45,6 +45,7 @@
 import org.lamsfoundation.lams.usermanagement.UserOrganisation;
 import org.lamsfoundation.lams.usermanagement.UserOrganisationRole;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -75,6 +76,8 @@
 	private static final Logger log = Logger.getLogger(OrgManageAction.class);
 	
 	private static IUserManagementService service;
+	
+	private static MessageService messageService;
 
 	
 	public ActionForward execute(ActionMapping mapping,
@@ -88,23 +91,24 @@
 			orgId = (Integer)request.getAttribute("org");
 		}
 		if((orgId==null)||(orgId<=0)){
-			errors.add("org",new ActionMessage("error.org.invalid"));
-			saveErrors(request,errors);
+			request.setAttribute("errorName","OrgManageAction");
+			request.setAttribute("errorMessage",getMessageService().getMessage("error.org.invalid"));
 			return mapping.findForward("error");
 		}
 		String username = request.getRemoteUser();
 		OrgListDTO orgManageForm = new OrgListDTO();
 		Organisation org = (Organisation)getService().findById(Organisation.class,orgId);
 		log.debug("orgId:"+orgId);
 		if(org==null){
-			errors.add("org",new ActionMessage("error.org.invalid"));
+			request.setAttribute("errorName","OrgManageAction");
+			request.setAttribute("errorMessage",getMessageService().getMessage("error.org.invalid"));
+			return mapping.findForward("error");
 		}else if(org.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)){
-			errors.add("org",new ActionMessage("error.orgtype.invalid"));
-		}
-		if(!errors.isEmpty()){
-			saveErrors(request,errors);
+			request.setAttribute("errorName","OrgManageAction");
+			request.setAttribute("errorMessage",getMessageService().getMessage("error.orgtype.invalid"));
 			return mapping.findForward("error");
 		}
+		
 		orgManageForm.setParentId(orgId);
 		orgManageForm.setParentName(org.getName());
 		orgManageForm.setType(org.getOrganisationType().getOrganisationTypeId());
@@ -148,5 +152,13 @@
 		}
 		return service;
 	}
+	
+	private MessageService getMessageService(){
+		if(messageService==null){
+			WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
+			messageService = (MessageService)ctx.getBean("adminMessageService");
+		}
+		return messageService;
+	}
 
 }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java
===================================================================
diff -u -r7e663c388f1d40c36911265891d1e688ea3da620 -r1aeb1a8e497e3dc07173d5c9da597c491bd352be
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java	(.../UserManageAction.java)	(revision 7e663c388f1d40c36911265891d1e688ea3da620)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserManageAction.java	(.../UserManageAction.java)	(revision 1aeb1a8e497e3dc07173d5c9da597c491bd352be)
@@ -44,6 +44,7 @@
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -67,6 +68,7 @@
 	
 	private static final Logger log = Logger.getLogger(UserManageAction.class);
 	private static IUserManagementService service;
+	private static MessageService messageService;
 	
 	public ActionForward execute(ActionMapping mapping,
             ActionForm form,
@@ -80,17 +82,17 @@
 			orgId = (Integer)request.getAttribute("org");
 		}
 		if((orgId==null)||(orgId<=0)){
-			errors.add("org",new ActionMessage("error.org.invalid"));
-			saveErrors(request,errors);
+			request.setAttribute("errorName","UserManageAction");
+			request.setAttribute("errorMessage",getMessageService().getMessage("error.org.invalid"));
 			return mapping.findForward("error");
 		}
 		log.debug("orgId: "+orgId);
 		
 		// get org name
 		Organisation organisation = (Organisation)getService().findById(Organisation.class,orgId);
 		if(organisation==null) {
-			errors.add("org",new ActionMessage("error.org.invalid"));
-			saveErrors(request,errors);
+			request.setAttribute("errorName","UserManageAction");
+			request.setAttribute("errorMessage",getMessageService().getMessage("error.org.invalid"));
 			return mapping.findForward("error");
 		}
 		String orgName = organisation.getName();
@@ -113,19 +115,14 @@
 		}else if(getService().isUserInRole(userId,orgOfCourseAdmin.getOrganisationId(),Role.COURSE_ADMIN) || getService().isUserInRole(userId,orgOfCourseAdmin.getOrganisationId(),Role.COURSE_MANAGER)){
 			request.setAttribute("canAdd",orgOfCourseAdmin.getCourseAdminCanAddNewUsers());
 		}else{
-			errors.add("authorisation",new ActionMessage("error.authorisation"));
-			saveErrors(request,errors);
+			request.setAttribute("errorName","UserManageAction");
+			request.setAttribute("errorMessage",getMessageService().getMessage("error.authorisation"));
 			return mapping.findForward("error");
 		}
 		
 		// get list of users in org
 		List users = getService().getUsersFromOrganisation(orgId);
 		Collections.sort(users);
-		if(users==null){
-			errors.add("org",new ActionMessage("error.org.invalid"));
-			saveErrors(request,errors);
-			return mapping.findForward("error");
-		}
 		
 		// create form object
 		UserListDTO userManageForm = new UserListDTO();
@@ -163,4 +160,12 @@
 		}
 		return service;
 	}
+	
+	private MessageService getMessageService(){
+		if(messageService==null){
+			WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
+			messageService = (MessageService)ctx.getBean("adminMessageService");
+		}
+		return messageService;
+	}
 }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java
===================================================================
diff -u -r15e10e04c8ed121dcf87859d994bc2a3f96cfac7 -r1aeb1a8e497e3dc07173d5c9da597c491bd352be
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java	(.../UserOrgAction.java)	(revision 15e10e04c8ed121dcf87859d994bc2a3f96cfac7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgAction.java	(.../UserOrgAction.java)	(revision 1aeb1a8e497e3dc07173d5c9da597c491bd352be)
@@ -44,6 +44,7 @@
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -68,6 +69,7 @@
 	
 	private static final Logger log = Logger.getLogger(UserOrgAction.class);
 	private static IUserManagementService service;
+	private static MessageService messageService;
 	
 	public ActionForward execute(ActionMapping mapping,
             ActionForm form,
@@ -81,8 +83,8 @@
 		Organisation organisation = (Organisation)getService().findById(Organisation.class,orgId);
 
 		if((orgId==null)||(orgId<=0)||organisation==null){
-			errors.add("orgId",new ActionMessage("error.org.invalid"));
-			saveErrors(request,errors);
+			request.setAttribute("errorName","UserOrgAction");
+			request.setAttribute("errorMessage",getMessageService().getMessage("error.org.invalid"));
 			return mapping.findForward("error");
 		}
 		
@@ -112,8 +114,8 @@
 					users = getService().getUsersFromOrganisation(orgId);
 				}
 			}else{
-				errors.add("authorisation",new ActionMessage("error.authorisation"));
-				saveErrors(request,errors);
+				request.setAttribute("errorName","UserOrgAction");
+				request.setAttribute("errorMessage",getMessageService().getMessage("error.authorisation"));
 				return mapping.findForward("error");
 			}
 		}
@@ -144,4 +146,11 @@
 		return service;
 	}
 	
+	private MessageService getMessageService(){
+		if(messageService==null){
+			WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
+			messageService = (MessageService)ctx.getBean("adminMessageService");
+		}
+		return messageService;
+	}
 }