Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleAction.java
===================================================================
diff -u -r0b201010a3f2d6c762f377e1389657d8c9f67ba1 -r3d1d6ad7e14e65bf2f8cb8228dde27c94f627a6a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleAction.java	(.../UserOrgRoleAction.java)	(revision 0b201010a3f2d6c762f377e1389657d8c9f67ba1)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleAction.java	(.../UserOrgRoleAction.java)	(revision 3d1d6ad7e14e65bf2f8cb8228dde27c94f627a6a)
@@ -81,6 +81,7 @@
 		
 		// set list of roles appropriate for the organisation type
 		List roles = (List)request.getAttribute("roles");
+		request.setAttribute("numroles", roles.size());
 		log.debug("num roles: "+roles.size());
 		Collections.sort(roles);
 		request.setAttribute("roles",roles);
Index: lams_admin/web/userorg.jsp
===================================================================
diff -u -r4d20310bee119052061dda3443aa0c0936fd2bf4 -r3d1d6ad7e14e65bf2f8cb8228dde27c94f627a6a
--- lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision 4d20310bee119052061dda3443aa0c0936fd2bf4)
+++ lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision 3d1d6ad7e14e65bf2f8cb8228dde27c94f627a6a)
@@ -6,6 +6,14 @@
 <%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
+<script language="javascript" type="text/JavaScript">
+function toggleCheckboxes(){
+	<logic:iterate id="user" name="userlist" indexId="index" >
+	document.UserOrgForm.userIds[<bean:write name="index" />].checked=document.UserOrgForm.allCheckboxes.checked;
+	</logic:iterate>
+}
+</script>
+
 <html-el:form action="/userorgsave.do" method="post">
 <html-el:hidden property="orgId" />
 <h2 align="left">
@@ -25,7 +33,7 @@
 	<th><fmt:message key="admin.user.title"/></th>
 	<th><fmt:message key="admin.user.first_name"/></th>
 	<th><fmt:message key="admin.user.last_name"/></th>
-	<th></th>
+	<th><input type="checkbox" name="allCheckboxes" onclick="toggleCheckboxes();" onkeyup="toggleCheckboxes();" /></th>
 </tr>
 
 <logic:iterate id="user" name="userlist">
Index: lams_admin/web/userorgrole.jsp
===================================================================
diff -u -r450afe431ce3a7256a239d65f2bb4aba38acb393 -r3d1d6ad7e14e65bf2f8cb8228dde27c94f627a6a
--- lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision 450afe431ce3a7256a239d65f2bb4aba38acb393)
+++ lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision 3d1d6ad7e14e65bf2f8cb8228dde27c94f627a6a)
@@ -6,29 +6,46 @@
 <%@ taglib uri="tags-logic-el" prefix="logic-el" %>
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 
+<script language="javascript" type="text/JavaScript">
+function toggleCheckboxes(roleIndex, object){
+	<logic-el:iterate id="userBean" name="UserOrgRoleForm" property="userBeans" indexId="beanIndex" >
+	document.UserOrgRoleForm.elements[roleIndex+1+<c:out value="${numroles}" />*(<c:out value="${beanIndex}" />+1)].checked=object.checked;
+	</logic-el:iterate>
+}
+</script>
+
+<h2>Assign Roles</h2>
+
 <div align="center"><html-el:errors/></div>
 
 <html-el:form action="/userorgrolesave.do" method="post">
 <html-el:hidden property="orgId" />
 <table class="alternative-color" width=100%>
 <tr>
 	<th><fmt:message key="admin.user.login"/></th>
-	<th><fmt:message key="admin.user.roles"/></th>
+	<logic-el:iterate id="role" name="roles" indexId="roleIndex">
+		<th><input type="checkbox" 
+					name="<c:out value="${roleIndex}" />" 
+					onclick="toggleCheckboxes(<c:out value="${roleIndex}" />, this);" 
+					onkeyup="toggleCheckboxes(<c:out value="${roleIndex}" />, this);" />
+			<c:out value="${role.name}" /></th>
+	</logic-el:iterate>
 </tr>
 <logic-el:iterate id="userBean" name="UserOrgRoleForm" property="userBeans" indexId="beanIndex">
 	<tr>
 		<td>
 			<c:out value="${userBean.login}" /><br />
 		</td>
-		<td>
-			<logic-el:iterate id="role" name="roles">
-				<html-el:multibox property="userBeans[${beanIndex}].roleIds" value="${role.roleId}" /> <c:out value="${role.name}" />&nbsp;
-			</logic-el:iterate>
-		</td>
+		<logic-el:iterate id="role" name="roles">
+			<td>
+				<html-el:multibox property="userBeans[${beanIndex}].roleIds" value="${role.roleId}" />&nbsp;
+			</td>
+		</logic-el:iterate>
 	</tr>
 </logic-el:iterate>
 <tr>
-	<td colspan=2 align="right">
+	<td></td>
+	<td colspan=<c:out value="${numroles}" /> align="right">
 		<html-el:submit><fmt:message key="admin.save"/></html-el:submit>
 		<html-el:reset><fmt:message key="admin.reset"/></html-el:reset>
 		<html-el:cancel><fmt:message key="admin.cancel"/></html-el:cancel>