Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java
===================================================================
diff -u -rff056fe666b6a9a6c93cb2c02fa520345c1b077f -r0b5b99ca4e4f6d595380e2eb2cbd0b8cc146e910
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	(.../UserAction.java)	(revision ff056fe666b6a9a6c93cb2c02fa520345c1b077f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	(.../UserAction.java)	(revision 0b5b99ca4e4f6d595380e2eb2cbd0b8cc146e910)
@@ -89,27 +89,20 @@
 		    request.setAttribute("org",orgId);
 		}
 		
+        // get system's roles
+		List allRoles = service.findAll(Role.class);
+		Collections.sort(allRoles);
+		request.setAttribute("rolelist",allRoles);
+		
 		// editing a user
 		Integer userId = WebUtil.readIntParam(request,"userId",true);
+		DynaActionForm userForm = (DynaActionForm)form;
 		if(userId != null) {
 			log.debug("got userid to edit: "+userId);
 			User user = (User)service.findById(User.class,userId);
-			DynaActionForm userForm = (DynaActionForm)form;
 			BeanUtils.copyProperties(userForm, user);
 			BeanUtils.setProperty(userForm,"password2",user.getPassword());
 			
-			// get system's roles
-			List allRoles = service.findAll(Role.class);
-			/*ArrayList<RoleDTO> rolelist = new ArrayList<RoleDTO>();
-			for(int i=0; i<allRoles.size(); i++){
-				Role r = (Role)allRoles.get(i);
-			    rolelist.add(new RoleDTO(r));
-			}
-			Collections.sort(rolelist);
-			request.setAttribute("rolelist",rolelist);*/
-			Collections.sort(allRoles);
-			request.setAttribute("rolelist",allRoles);
-			
 			// get user's roles
 			Iterator iter = user.getUserOrganisations().iterator();
 			while(iter.hasNext()){
@@ -128,7 +121,9 @@
 			        break;
 			    }
 			}
-			
+		}else{
+			String[] roles = new String[0];
+			userForm.set("roles",roles);
 		}
 		
 		Organisation org = (Organisation)service.findById(Organisation.class,orgId);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java
===================================================================
diff -u -r91ebec97ab403d06d36d5e1d141bdfb71c0fad28 -r0b5b99ca4e4f6d595380e2eb2cbd0b8cc146e910
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java	(.../UserSaveAction.java)	(revision 91ebec97ab403d06d36d5e1d141bdfb71c0fad28)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java	(.../UserSaveAction.java)	(revision 0b5b99ca4e4f6d595380e2eb2cbd0b8cc146e910)
@@ -114,14 +114,14 @@
 			Integer userId = (Integer)userForm.get("userId");
 			User user;
 			log.debug("got userId: "+userId);
+			String[] roles = (String[])userForm.get("roles");
 			if(userId!=0){    // edit user
 				edit = true;
 				log.debug("editing userId: "+userId);
 				user = (User)service.findById(User.class,userId);
 				BeanUtils.copyProperties(user,userForm);
 				service.save(user);
 				
-				String[] roles = (String[])userForm.get("roles");
 				List rolesList = Arrays.asList(roles);
 				log.debug("rolesList.size: "+rolesList.size());
 				Set uos = user.getUserOrganisations();
@@ -146,11 +146,6 @@
 					            log.debug("setting role: "+currentRole);
 					            UserOrganisationRole newUor = new UserOrganisationRole(uo,currentRole);
 					            service.save(newUor);
-					            /*uors.add(newUor);
-					            uo.setUserOrganisationRoles(uors);
-					            user.setUserOrganisations(uos);
-					            service.save(user);*/
-					            //log.debug("num roles: "+uo.getUserOrganisationRoles().size());
 				        	}
 				        }
 				        Iterator iter3 = uors.iterator();
@@ -192,10 +187,17 @@
 					UserOrganisation uo = new UserOrganisation(user, (Organisation)service.findById(Organisation.class,orgId));
 					service.save(uo);
 					log.debug("userOrganisation: "+uo);
-					Role role = (Role)service.findByProperty(Role.class,"name","LEARNER").get(0);
+					for(int i=0; i<roles.length; i++){    // add new roles set by user
+			        	Integer roleId = Integer.valueOf(roles[i]);
+			            Role role = (Role)service.findById(Role.class,roleId);
+				        UserOrganisationRole uor = new UserOrganisationRole(uo,role);
+				        service.save(uor);
+				        log.debug("role: "+role);
+			        }
+					/*Role role = (Role)service.findByProperty(Role.class,"name","LEARNER").get(0);
 					UserOrganisationRole uor = new UserOrganisationRole(uo,role);
 					service.save(uor);
-					log.debug("userOrganisationRole: "+uor);
+					log.debug("userOrganisationRole: "+uor);*/
 					HashSet uos = new HashSet();
 					uos.add(uo);
 					user.setUserOrganisations(uos);
Index: lams_admin/web/user.jsp
===================================================================
diff -u -r4d20310bee119052061dda3443aa0c0936fd2bf4 -r0b5b99ca4e4f6d595380e2eb2cbd0b8cc146e910
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision 4d20310bee119052061dda3443aa0c0936fd2bf4)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision 0b5b99ca4e4f6d595380e2eb2cbd0b8cc146e910)
@@ -114,18 +114,16 @@
 			</html-el:select>
 		</td>
 	</tr>
-	<logic:notEmpty name="UserForm" property="userId">
-	    <tr>
-	        <td><fmt:message key="admin.user.roles"/>:</td>
-	        <td>
-                <c:forEach items="${rolelist}" var="role">
-                    <html-el:multibox name="UserForm" property="roles" value="${role.roleId}"/>
-                    <c:out value="${role.name}"/><br/>
-                </c:forEach>
-	        </td>
-	    </tr>
-	</logic:notEmpty>
 	<tr>
+	    <td><fmt:message key="admin.user.roles"/>:</td>
+	    <td>
+            <c:forEach items="${rolelist}" var="role">
+                <html-el:multibox name="UserForm" property="roles" value="${role.roleId}"/>
+                <c:out value="${role.name}"/><br/>
+            </c:forEach>
+	    </td>
+	</tr>
+	<tr>
 		<td colspan=2 align="right">
 			<html-el:submit><fmt:message key="admin.save"/></html-el:submit>
 			<html-el:reset><fmt:message key="admin.reset"/></html-el:reset>