Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
===================================================================
diff -u -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 -rc9e22b65129fe7561d7e66f5d6338557b0f3236a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java	(.../LtiConsumerManagementController.java)	(revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java	(.../LtiConsumerManagementController.java)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
@@ -156,7 +156,7 @@
 	    List<ExtServer> listServer = userManagementService.findByProperty(ExtServer.class, "serverid",
 		    ltiConsumerForm.getServerid());
 	    if (listServer != null && listServer.size() > 0) {
-		if (sid.equals(0)) {//new map
+		if (sid == null) {//new map
 		    errorMap.add("serverid", messageService.getMessage("error.not.unique",
 			    new Object[] { messageService.getMessage("sysadmin.serverid") }));
 		} else {
@@ -171,7 +171,7 @@
 	    List<ExtServer> listPrefix = userManagementService.findByProperty(ExtServer.class, "prefix",
 		    ltiConsumerForm.getPrefix());
 	    if (listPrefix != null && listPrefix.size() > 0) {
-		if (sid.equals(0)) {//new map
+		if (sid == null) {//new map
 		    errorMap.add("prefix", messageService.getMessage("error.not.unique",
 			    new Object[] { messageService.getMessage("sysadmin.prefix") }));
 		} else {
@@ -186,7 +186,7 @@
 
 	if (errorMap.isEmpty()) {
 	    ExtServer ltiConsumer = null;
-	    if (sid.equals(0)) {
+	    if (sid == null) {
 		ltiConsumer = new ExtServer();
 		BeanUtils.copyProperties(ltiConsumer, ltiConsumerForm);
 		ltiConsumer.setSid(null);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -rc9e22b65129fe7561d7e66f5d6338557b0f3236a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java	(.../OrgManageController.java)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java	(.../OrgManageController.java)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
@@ -80,6 +80,7 @@
 
 	// Get organisation whose child organisations we will populate the OrgManageForm with
 	Integer orgId = WebUtil.readIntParam(request, "org", true);
+
 	if (orgId == null) {
 	    orgId = (Integer) request.getAttribute("org");
 	}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java
===================================================================
diff -u -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 -rc9e22b65129fe7561d7e66f5d6338557b0f3236a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java	(.../OrgSaveController.java)	(revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java	(.../OrgSaveController.java)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
@@ -121,7 +121,7 @@
 	    OrganisationState state = (OrganisationState) service.findById(OrganisationState.class,
 		    organisationForm.getStateId());
 
-	    if (orgId != 0) {
+	    if (orgId != null) {
 		if (service.canEditGroup(user.getUserID(), orgId)) {
 		    org = (Organisation) service.findById(Organisation.class, orgId);
 		    // set archived date only when it first changes to become archived
@@ -142,7 +142,7 @@
 		org.setParentOrganisation(
 			(Organisation) service.findById(Organisation.class, organisationForm.getParentId()));
 		org.setOrganisationType(
-			(OrganisationType) service.findById(OrganisationType.class, organisationForm.getOrgId()));
+			(OrganisationType) service.findById(OrganisationType.class, organisationForm.getTypeId()));
 		writeAuditLog(user, org, organisationForm, org.getOrganisationState(), org.getLocale());
 	    }
 	    org.setLocale(locale);
@@ -171,7 +171,7 @@
 	String message;
 
 	// audit log entries for organisation attribute changes
-	if (orgForm.getOrgId() != 0) {
+	if (orgForm.getOrgId() != null) {
 	    final String key = "audit.organisation.change";
 	    String[] args = new String[4];
 	    args[1] = org.getName() + "(" + org.getOrganisationId() + ")";
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java
===================================================================
diff -u -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 -rc9e22b65129fe7561d7e66f5d6338557b0f3236a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java	(.../ServerSaveController.java)	(revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java	(.../ServerSaveController.java)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
@@ -116,7 +116,7 @@
 		    errorMap.add("prefix", messageService.getMessage("error.not.unique",
 			    new Object[] { messageService.getMessage("sysadmin.prefix") }));
 		} else {
-		    ExtServer map = (ExtServer) listServer.get(0);
+		    ExtServer map = (ExtServer) listPrefix.get(0);
 		    if (!map.getSid().equals(sid)) {
 			errorMap.add("prefix", messageService.getMessage("error.not.unique",
 				new Object[] { messageService.getMessage("sysadmin.prefix") }));
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java
===================================================================
diff -u -r8fda3f2b8430c0d3e57a94953e84582eb3aad8c6 -rc9e22b65129fe7561d7e66f5d6338557b0f3236a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java	(.../UserController.java)	(revision 8fda3f2b8430c0d3e57a94953e84582eb3aad8c6)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java	(.../UserController.java)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
@@ -345,7 +345,7 @@
 	}
     }
 
-    @RequestMapping(path = "/delete", method = RequestMethod.POST)
+    @RequestMapping(path = "/delete")
     public String delete(HttpServletRequest request) throws Exception {
 
 	initServices();
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgController.java
===================================================================
diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc9e22b65129fe7561d7e66f5d6338557b0f3236a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgController.java	(.../UserOrgController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgController.java	(.../UserOrgController.java)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
@@ -70,14 +70,13 @@
 	service = AdminServiceProxy.getService(applicationContext.getServletContext());
 	messageService = AdminServiceProxy.getMessageService(applicationContext.getServletContext());
 
-	//ActionMessages errors = new ActionMessages();
 	Integer orgId = WebUtil.readIntParam(request, "orgId", true);
 	log.debug("orgId: " + orgId);
 	// get org name
 	Organisation organisation = (Organisation) service.findById(Organisation.class, orgId);
 
 	if ((orgId == null) || (orgId <= 0) || organisation == null) {
-	    request.setAttribute("errorName", "UserOrgAction");
+	    request.setAttribute("errorName", "UserOrgController");
 	    request.setAttribute("errorMessage", messageService.getMessage("error.org.invalid"));
 	    return "error";
 	}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java
===================================================================
diff -u -r0aee88559b0d79e0516dd3630c24111361aeb787 -rc9e22b65129fe7561d7e66f5d6338557b0f3236a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java	(.../UserOrgRoleController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java	(.../UserOrgRoleController.java)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
@@ -41,6 +41,7 @@
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -72,8 +73,9 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
+    @SuppressWarnings("unchecked")
     @RequestMapping(path = "/userorgrole")
-    public String execute(@ModelAttribute UserOrgRoleForm userOrgRoleForm, HttpServletRequest request)
+    public String execute(@ModelAttribute UserOrgRoleForm userOrgRoleForm, BindingResult result, HttpServletRequest request)
 	    throws Exception {
 
 	service = AdminServiceProxy.getService(applicationContext.getServletContext());
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java
===================================================================
diff -u -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 -rc9e22b65129fe7561d7e66f5d6338557b0f3236a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java	(.../UserOrgRoleSaveController.java)	(revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java	(.../UserOrgRoleSaveController.java)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
@@ -90,12 +90,8 @@
 	log.debug("orgId: " + orgId);
 
 	request.setAttribute("org", orgId);
-	request.getSession().removeAttribute("UserOrgRoleForm");
+	request.getSession().removeAttribute("userOrgRoleForm");
 
-	if (request.getAttribute("CANCEL") != null) {
-	    return "redirect:/usermanage.do";
-	}
-
 	// save UserOrganisation memberships, and the associated roles;
 	// for subgroups, if user is not a member of the parent group then add to that as well.
 	for (int i = 0; i < userBeans.size(); i++) {
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java
===================================================================
diff -u -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 -rc9e22b65129fe7561d7e66f5d6338557b0f3236a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java	(.../UserOrgSaveController.java)	(revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java	(.../UserOrgSaveController.java)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
@@ -70,7 +70,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping(path = "/userorgsave", method = RequestMethod.POST)
+    @RequestMapping(path = "/userorgsave")
     public String execute(@ModelAttribute UserOrgForm userOrgForm, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
@@ -137,7 +137,7 @@
 		    organisation.getOrganisationType()));
 	    request.setAttribute("newUserOrganisations", newUserOrganisations);
 	    request.setAttribute("orgId", orgId);
-	    return "redirect:/userorgrole.do";
+	    return "forward:/userorgrole.do";
 	}
     }
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java
===================================================================
diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -rc9e22b65129fe7561d7e66f5d6338557b0f3236a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java	(.../UserRolesController.java)	(revision 198db26e45c4083d69e39fcd40ffed3f7918fc58)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java	(.../UserRolesController.java)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
@@ -155,11 +155,10 @@
 		i++;
 	    }
 	} else {
-	    Errors messages = null;
-	    messages.reject("roles", messageService.getMessage("msg.add.to.org", org.getName()));
+	    errorMap.add("roles", messageService.getMessage("msg.add.to.org", org.getName()));
 	}
 	userRolesForm.setRoles(roles);
-
+	request.setAttribute("errorMap", errorMap);
 	return "userrole";
     }
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java
===================================================================
diff -u -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 -rc9e22b65129fe7561d7e66f5d6338557b0f3236a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java	(.../UserSaveController.java)	(revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java	(.../UserSaveController.java)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
@@ -119,7 +119,7 @@
 	}
 
 	User user = null;
-	if (userId != 0) {
+	if (userId != null) {
 	    edit = true;
 	    user = (User) UserSaveController.service.findById(User.class, userId);
 	}
@@ -232,20 +232,20 @@
 
 	if (errorMap.isEmpty()) {
 	    if ((orgId == null) || (orgId == 0)) {
-		return "redirect:../usersearch.do";
+		return "redirect:/usersearch.do";
 	    }
 	    if (edit) {
 		request.setAttribute("org", orgId);
-		return "redirect:../usermanage.do";
+		return "redirect:/usermanage.do";
 	    } else {
 		request.setAttribute("orgId", orgId);
 		request.setAttribute("userId", user.getUserId());
-		return "redirect:../userroles.do";
+		return "redirect:/userroles.do";
 	    }
 	} else {
 	    request.setAttribute("orgId", orgId);
 	    request.setAttribute("errorMap", errorMap);
-	    return "forward:../user/edit.do";
+	    return "forward:/user/edit.do";
 	}
     }
 
@@ -255,6 +255,7 @@
 
 	UserSaveController.service = AdminServiceProxy.getService(applicationContext.getServletContext());
 	Integer userId = WebUtil.readIntParam(request, "userId", true);
+	userForm.setUserId(userId);
 	ISecurityService securityService = AdminServiceProxy.getSecurityService(applicationContext.getServletContext());
 	Integer loggeduserId = ((UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER)).getUserID();
 
@@ -287,7 +288,7 @@
 	    user.setSalt(salt);
 	    user.setPassword(passwordHash);
 	    UserSaveController.service.saveUser(user);
-	    return "redirect:../user/edit.do";
+	    return "forward:/user/edit.do";
 	}
 	request.setAttribute("errorMap", errorMap);
 	return "userChangePass";
Index: lams_admin/web/import/importexcel.jsp
===================================================================
diff -u -r472fb979e3afdb43a7d537e588c5204554ba9f38 -rc9e22b65129fe7561d7e66f5d6338557b0f3236a
--- lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision 472fb979e3afdb43a7d537e588c5204554ba9f38)
+++ lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
@@ -54,6 +54,7 @@
 	 </script>
 </lams:head>
     
+<body class="stripes">
 
 	<c:set var="title"><fmt:message key="admin.user.management"/></c:set>
 	<c:set var="help"><fmt:message key="Import+Users"/></c:set>
Index: lams_admin/web/organisation/list.jsp
===================================================================
diff -u -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 -rc9e22b65129fe7561d7e66f5d6338557b0f3236a
--- lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6)
+++ lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
@@ -147,7 +147,7 @@
 				</form>
 			
 				<form:form cssClass="indentPad" action="orgmanage.do" modelAttribute="orgManageForm" id="orgManageForm" method="post">
-					<input type="hidden" name="org" value="<c:out value="${orgManageForm.parentId}"/>" />
+					<input type="hidden" name="org" value="${orgManageForm.parentId}" />
 					<fmt:message key="label.show"/>&nbsp;
 					<form:select path="stateId" id="org-state-id" cssClass="form-control form-control-inline input-sm">
 						<form:option value="1"><fmt:message key="organisation.state.ACTIVE"/></form:option>
Index: lams_admin/web/user.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -rc9e22b65129fe7561d7e66f5d6338557b0f3236a
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
@@ -501,12 +501,12 @@
 					<div class="col-md-12">
 						<c:if test="${not empty userForm.userId}">
 							<div class="pull-left">
-							<a href="./userChangePass.jsp?userId=${userForm.userId}&login=${userForm.login}" class="btn btn-primary"><fmt:message key="admin.user.changePassword" /></a>
+							<a href="<lams:LAMSURL/>admin/userChangePass.jsp?userId=${userForm.userId}&login=${userForm.login}" class="btn btn-primary"><fmt:message key="admin.user.changePassword" /></a>
 							</div>
 						</c:if>
 						
 						<div class="pull-right">
-							<a href="javascript:history.back();" class="btn btn-default"> <fmt:message key="admin.cancel" /> </a>
+							<a href="<lams:LAMSURL/>admin/usersearch.do" class="btn btn-default"> <fmt:message key="admin.cancel" /> </a>
 							<input type="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
 						</div>
 					</div>
Index: lams_admin/web/userChangePass.jsp
===================================================================
diff -u -r198db26e45c4083d69e39fcd40ffed3f7918fc58 -rc9e22b65129fe7561d7e66f5d6338557b0f3236a
--- lams_admin/web/userChangePass.jsp	(.../userChangePass.jsp)	(revision 198db26e45c4083d69e39fcd40ffed3f7918fc58)
+++ lams_admin/web/userChangePass.jsp	(.../userChangePass.jsp)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
@@ -85,8 +85,8 @@
 
 
 <body class="stripes">
-	<form id="userForm" modelAttribute="userForm" action="../usersave/changePass.do" method="post">
-		<form:hidden path="userId" />
+	<form id="userForm" modelAttribute="userForm" action="usersave/changePass.do" method="post">
+		<input type="hidden" name="userId" value="${param.userId}" />
 		<div class="panel panel-default">
 			<div
 				class="col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
Index: lams_admin/web/userorg.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -rc9e22b65129fe7561d7e66f5d6338557b0f3236a
--- lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
@@ -168,15 +168,6 @@
 				<h4><fmt:message key="admin.user.add"/></h4>
 				
 				<div align="center">
-				<%-- Error Messages --%>
-					 <c:set var="errorKey" value="GLOBAL" />
-					   <c:if test="${not empty errorMap and not empty errorMap[errorKey]}">
-					      <lams:Alert id="error" type="danger" close="false">
-					        <c:forEach var="error" items="${errorMap[errorKey]}">
-					           <c:out value="${error}" />
-					        </c:forEach>
-					      </lams:Alert>
-					  </c:if>
 				</div>
 				
 				<c:if test="${orgType == 2}">
Index: lams_admin/web/userorgrole.jsp
===================================================================
diff -u -r79b6147f263fbc3c92e2db7d98227fa8f7358851 -rc9e22b65129fe7561d7e66f5d6338557b0f3236a
--- lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision 79b6147f263fbc3c92e2db7d98227fa8f7358851)
+++ lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
@@ -2,9 +2,10 @@
 
 <%@ include file="/taglibs.jsp"%>
 
+
 <lams:html>
 <lams:head>
-	<c:set var="title"><fmt:message key="admin.user.management"/></c:set>
+	<c:set var="title"><fmt:message key="admin.user.entry"/></c:set>
 	<title>${title}</title>
 
 	<lams:css/>
@@ -16,69 +17,73 @@
 	<script language="javascript" type="text/JavaScript">
 	function toggleCheckboxes(roleIndex, object){
 		<c:forEach var="userBean" items="${userOrgRoleForm.userBeans}" varStatus="beanIndex" >
-		document.forms.userOrgRoleForm.elements[roleIndex+1+<c:out value="${numroles}" />*(<c:out value="${beanIndex.index}" />+1)].checked=object.checked;
+		document.forms.userOrgRoleForm.elements[roleIndex+1+<c:out value="${numroles}"/>*(<c:out value="${beanIndex.index}"/>+1)].checked=object.checked;
 		</c:forEach>
 	}
 	</script>
+	
 </lams:head>
     
 <body class="stripes">
 	<c:set var="title">${title}: <fmt:message key="admin.user.assign.roles"/></c:set>
 	<lams:Page type="admin" title="${title}" formID="userOrgRoleForm">
-				
-				<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
-			    <c:if test="${not empty pOrgId}">
-			        : <a href="orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><c:out value="${pOrgName}"/></a>
-			    </c:if>
-			    <c:if test="${UserOrgRoleForm.orgId != 1}">
-					: <a href="<c:if test="${orgType == 3}">user</c:if><c:if test="${orgType != 3}">org</c:if>manage.do?org=<c:out value="${userOrgRoleForm.orgId}" />" class="btn btn-default">
-					<c:out value="${orgName}"/></a>
-				</c:if>
-				<c:if test="${userOrgRoleForm.orgId == 1}">
-					: <a href="usermanage.do?org=<c:out value="${userOrgRoleForm.orgId}"/>" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
-				</c:if>
-			</h4>
-			
-			<h1><fmt:message key="admin.user.assign.roles" /></h1>
-			
-			<p><fmt:message key="msg.roles.mandatory.users"/></p>
-			
-		<form:form action="userorgrolesave.do" method="post" modelAttribute="userOrgRoleForm" id="userOrgRoleForm">
-			<form:hidden path="orgId" />
-			
-			<table class="table table-condensed table-no-border">
+		
+		<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
+	    <c:if test="${not empty pOrgId}">
+	        : <a href="orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><c:out value="${pOrgName}"/></a>
+	    </c:if>
+	    <c:if test="${userOrgRoleForm.orgId != 1}">
+			: <a href="<c:if test="${orgType == 3}">user</c:if><c:if test="${orgType != 3}">org</c:if>manage.do?org=<c:out value="${userOrgRoleForm.orgId}" />" class="btn btn-default">
+			<c:out value="${orgName}"/></a>
+		</c:if>
+		<c:if test="${userOrgRoleForm.orgId == 1}">
+			: <a href="usermanage.do?org=<c:out value="${userOrgRoleForm.orgId}" />" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
+		</c:if>
+		</h4>
+		
+		<h1><fmt:message key="admin.user.assign.roles" /></h1>
+		
+		<p><fmt:message key="msg.roles.mandatory.users"/></p>
+		
+		<form:form action="../userorgrolesave.do" modelAttribute="userOrgRoleForm" id="userOrgRoleForm" method="post">
+		<input type="hidden" name="orgId" />
+		
+		<table class="table table-condensed table-no-border">
+		<tr>
+			<th><fmt:message key="admin.user.login"/></th>
+			<c:forEach var="role" items="${roles}" varStatus="roleIndex">
+				<th><input type="checkbox" 
+							name="<c:out value="${roleIndex.index}" />" 
+							onclick="toggleCheckboxes(<c:out value="${roleIndex.index}" />, this);" 
+							onkeyup="toggleCheckboxes(<c:out value="${roleIndex.index}" />, this);" />&nbsp;
+					<fmt:message>role.<lams:role role="${role.name}" /></fmt:message></th>
+			</c:forEach>
+		</tr>
+		<c:forEach var="userBean" items="${userOrgRoleForm.userBeans}" varStatus="beanIndex">
 			<tr>
-				<th><fmt:message key="admin.user.login"/></th>
-				<c:forEach var="role" items="${roles}" varStatus="roleIndex">
-					<th><input type="checkbox" name="${roleIndex.index}" onclick="toggleCheckboxes(${roleIndex.index}, this);" 
-						onkeyup="toggleCheckboxes(${roleIndex.index}, this);" />&nbsp;
-						<fmt:message>role.<lams:role role="${role.name}" /></fmt:message></th>
-				</c:forEach>
-			</tr>
-			<c:forEach var="userBean" items="${userOrgRoleForm.userBeans}" varStatus="beanIndex">
-				<tr>
+				<td>
+					<c:out value="${userBean.login}" /><c:if test="${!userBean.memberOfParent}"> *<c:set var="parentFlag" value="true" /></c:if>
+				</td>
+				<c:forEach var="role" items="${roles}">
 					<td>
-						<c:out value="${userBean.login}" /><c:if test="${!userBean.memberOfParent}"> *<c:set var="parentFlag" value="true" /></c:if>
+						<form:checkbox id="${userBean.login}Role${role.roleId}" path="userBeans[${beanIndex.index}].roleId" value="${role.roleId}" />&nbsp;
 					</td>
-					<c:forEach var="role" items="${roles}">
-						<td>
-							<form:checkbox id="${userBean.login}Role${role.roleId}" path="userBeans[${beanIndex.index}].roleIds" value="${role.roleId}" />&nbsp;
-						</td>
-					</c:forEach>
-				</tr>
-			</c:forEach>
-			</table>
-			<c:if test="${parentFlag}">
-			<p><fmt:message key="msg.user.add.to.parent.group" /></p>
-			</c:if>
-			
-			<div class="pull-right">
-				<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
-				<input type="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save"/>" />
-			</div>
+				</c:forEach>
+			</tr>
+		</c:forEach>
+		</table>
+		<c:if test="${parentFlag}">
+		<p><fmt:message key="msg.user.add.to.parent.group" /></p>
+		</c:if>
+		
+		<div class="pull-right">
+			<a href="usermanage.do?org=1" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
+			<input type="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save"/>" />
+		</div>
 		</form:form>
-	</lams:Page>
+		</lams:Page>
 
+
 </body>
 </lams:html>
 
Index: lams_admin/web/userrole.jsp
===================================================================
diff -u -rec30ad2cd8a7b048f296533bcb70fdafd80a3be6 -rc9e22b65129fe7561d7e66f5d6338557b0f3236a
--- lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision ec30ad2cd8a7b048f296533bcb70fdafd80a3be6)
+++ lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
@@ -65,7 +65,7 @@
 		  <div class="col-xs-2"><fmt:message key="admin.user.roles"/>:</div>
 		  <div class="col-xs-10">            
 		  	<c:forEach items="${rolelist}" var="role">
-		    	<form:checkbox path="roles" value="${role.roleId}"/>
+		    	<form:checkbox path="${userRolesForm.roles}" value="${role.roleId}"/>
 		        <fmt:message>role.<lams:role role="${role.name}" /></fmt:message><br/>
 		    </c:forEach>
 		  </div>