Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesAction.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r9fd77272f7d794bf7318b82da12a6a1dc097b162
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesAction.java	(.../UserRolesAction.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserRolesAction.java	(.../UserRolesAction.java)	(revision 9fd77272f7d794bf7318b82da12a6a1dc097b162)
@@ -88,7 +88,7 @@
 			saveErrors(request,errors);
 			return mapping.findForward("userrole");
 		}
-		if (userId==null) userId = (Integer)request.getAttribute("userId");
+		if (userId==null || userId==0) userId = (Integer)request.getAttribute("userId");
 		if (userId==null) {
 			errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.userid.invalid"));
 			saveErrors(request,errors);
@@ -118,6 +118,7 @@
 		request.setAttribute("rolelist",filterRoles(rolelist,isSysadmin,orgType));
 		request.setAttribute("login", user.getLogin());
 		request.setAttribute("fullName", user.getFullName());
+		request.setAttribute("orgName", org.getName());
 		
 		String[] roles = null;
 		UserOrganisation uo = getService().getUserOrganisation(userId, orgId);
Index: lams_admin/web/userrole.jsp
===================================================================
diff -u -r54ff12d78b5d617bc7767b37faea406d5675a746 -r9fd77272f7d794bf7318b82da12a6a1dc097b162
--- lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision 54ff12d78b5d617bc7767b37faea406d5675a746)
+++ lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision 9fd77272f7d794bf7318b82da12a6a1dc097b162)
@@ -9,21 +9,20 @@
 <html-el:form action="/userrolessave.do" method="post">
 <html-el:hidden property="userId" />
 <html-el:hidden property="orgId" />
-<h2 align="left"><fmt:message key="admin.user.assign.roles"/></h2>
+<h2 align="left"><fmt:message key="admin.user.assign.roles"/>: <bean:write name="orgName" /></h2>
 
 <div align="center"><html-el:errors/><html-el:messages id="roles" message="true"><bean:write name="roles" /></html-el:messages></div>
 <table>
-  <col align="right" /><col align="left" />
     <tr>
-		<td><fmt:message key="admin.user.login"/>:</td>
+		<td align="right"><fmt:message key="admin.user.login"/>:</td>
 		<td><bean:write name="login" /></td>
 	</tr>
 	<tr>
-		<td><fmt:message key="admin.user.name"/>:</td>
+		<td align="right"><fmt:message key="admin.user.name"/>:</td>
 		<td><bean:write name="fullName" /></td>
 	</tr>
 	<tr>
-	    <td><fmt:message key="admin.user.roles"/>:</td>
+	    <td align="right"><fmt:message key="admin.user.roles"/>:</td>
 	    <td>
             <c:forEach items="${rolelist}" var="role">
                 <html-el:multibox name="UserRolesForm" property="roles" value="${role.roleId}"/>