Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java
===================================================================
diff -u -rc9e22b65129fe7561d7e66f5d6338557b0f3236a -r912a82fab80bb985823a3d4b6168a9146ed97a7a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java	(.../UserRolesController.java)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesController.java	(.../UserRolesController.java)	(revision 912a82fab80bb985823a3d4b6168a9146ed97a7a)
@@ -86,13 +86,18 @@
 	}
 
 	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+	
 	Integer orgId = WebUtil.readIntParam(request, "orgId", true);
 	Integer userId = WebUtil.readIntParam(request, "userId", true);
 
 	// user and org ids passed as attributes by UserSaveAction
 	if (orgId == null) {
 	    orgId = (Integer) request.getAttribute("orgId");
 	}
+	
+	userRolesForm.setOrgId(orgId);
+	userRolesForm.setUserId(userId);
+	
 	if (orgId == null) {
 	    errorMap.add("GLOBAL", messageService.getMessage("error.org.invalid"));
 	    request.setAttribute("errorMap", errorMap);
@@ -158,7 +163,6 @@
 	    errorMap.add("roles", messageService.getMessage("msg.add.to.org", org.getName()));
 	}
 	userRolesForm.setRoles(roles);
-	request.setAttribute("errorMap", errorMap);
 	return "userrole";
     }
 
Index: lams_admin/web/userrole.jsp
===================================================================
diff -u -rc9e22b65129fe7561d7e66f5d6338557b0f3236a -r912a82fab80bb985823a3d4b6168a9146ed97a7a
--- lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision c9e22b65129fe7561d7e66f5d6338557b0f3236a)
+++ lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision 912a82fab80bb985823a3d4b6168a9146ed97a7a)
@@ -19,8 +19,9 @@
 	<lams:Page type="admin" title="${title}" formID="userRolesForm">
 	
 		<form:form action="./userrolessave.do" modelAttribute="userRolesForm" id="userRolesForm" method="post">
-		<form:hidden path="userId" />
 		<form:hidden path="orgId" />
+		<form:hidden path="userId" />
+		
 		<p>
 			<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
 			<c:if test="${not empty pOrgId}">
@@ -40,6 +41,14 @@
 		<p><fmt:message key="msg.roles.mandatory"/></p>
 		
 		<div align="center">
+		<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}" /><br /> 
+				 </c:forEach> 
+				</lams:Alert> 
+			</c:if>
 		<c:set var="errorKey" value="roles" /> 
 			<c:if test="${not empty errorMap and not empty errorMap[errorKey]}"> 
 				 <lams:Alert id="error" type="danger" close="false">