Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java,v
diff -u -r1.12 -r1.13
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java	23 Nov 2006 05:06:17 -0000	1.12
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java	23 Nov 2006 05:53:49 -0000	1.13
@@ -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");