Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java
===================================================================
diff -u -r014f8d44ccd74d20a8c00442ee9dd013521f4aea -r0d168b0c1513ab8ab339fcd6f306b811a4fa9799
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java	(.../UserOrgSaveAction.java)	(revision 014f8d44ccd74d20a8c00442ee9dd013521f4aea)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java	(.../UserOrgSaveAction.java)	(revision 0d168b0c1513ab8ab339fcd6f306b811a4fa9799)
@@ -142,7 +142,9 @@
 			log.debug("no new users to add to orgId="+orgId);
 			return mapping.findForward("userlist");
 		}else{
-			request.setAttribute("roles",service.filterRoles(rolelist,false, organisation.getOrganisationType()));
+			request.setAttribute("roles",service.filterRoles(rolelist,
+					request.isUserInRole(Role.SYSADMIN),
+					organisation.getOrganisationType()));
 			request.setAttribute("newUserOrganisations",newUserOrganisations);
 			request.setAttribute("orgId",orgId);
 			return mapping.findForward("userorgrole");