Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleSaveAction.java
===================================================================
diff -u -r3c820d8bd3694a6fa67fc979acb30266a4ddfa4d -re32f92f9f1bf4aeb3d539cf740742b1d4e6a528c
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleSaveAction.java	(.../UserOrgRoleSaveAction.java)	(revision 3c820d8bd3694a6fa67fc979acb30266a4ddfa4d)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleSaveAction.java	(.../UserOrgRoleSaveAction.java)	(revision e32f92f9f1bf4aeb3d539cf740742b1d4e6a528c)
@@ -25,6 +25,7 @@
 package org.lamsfoundation.lams.admin.web;
 
 import java.util.ArrayList;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -45,6 +46,8 @@
  * @author jliew
  * 
  * Saves roles for users that were just added.
+ * Uses session scope because using request scope doesn't copy the form data
+ * into UserOrgRoleForm's userBeans ArrayList (the list becomes empty).
  *
  */
 
@@ -85,13 +88,16 @@
 			UserBean bean = (UserBean)userBeans.get(i);
 			log.debug("user: "+bean.getUserId());
 			String[] roleIds = bean.getRoleIds();
+			UserOrganisation uo = getService().getUserOrganisation(bean.getUserId(),orgId);
+			Set uors = uo.getUserOrganisationRoles();
 			for(int j=0; j<roleIds.length; j++) {
 				Role currentRole = (Role)getService().findById(Role.class,new Integer(roleIds[j]));
 				log.debug("setting role: "+currentRole.getRoleId());
-				UserOrganisation uo = getService().getUserOrganisation(bean.getUserId(),orgId);
 				UserOrganisationRole newUor = new UserOrganisationRole(uo,currentRole);
-				getService().save(newUor);
+				uors.add(newUor);
 			}
+			uo.setUserOrganisationRoles(uors);
+			getService().save(uo);
 		}
 		return mapping.findForward("userlist");
 	}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java
===================================================================
diff -u -r93201ac4b55c13e6d9a2a4a39941996d91793d13 -re32f92f9f1bf4aeb3d539cf740742b1d4e6a528c
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java	(.../UserSaveAction.java)	(revision 93201ac4b55c13e6d9a2a4a39941996d91793d13)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java	(.../UserSaveAction.java)	(revision e32f92f9f1bf4aeb3d539cf740742b1d4e6a528c)
@@ -128,8 +128,6 @@
 					userForm.set("password",user.getPassword());
 				}
 				BeanUtils.copyProperties(user,userForm);
-				log.debug("country: "+user.getLocaleCountry());
-				log.debug("language: "+user.getLocaleLanguage());
 				user.setLocaleCountry(locale.getCountryIsoCode());
 				user.setLocaleLanguage(locale.getLanguageIsoCode());
 				log.debug("country: "+user.getLocaleCountry());
@@ -158,7 +156,7 @@
 				        		Role currentRole = (Role)getService().findById(Role.class,roleId);
 					            log.debug("setting role: "+currentRole);
 					            UserOrganisationRole newUor = new UserOrganisationRole(uo,currentRole);
-					            getService().save(newUor);
+					            uors.add(newUor);
 				        	}
 				        }
 				        Iterator iter3 = uors.iterator();
@@ -171,11 +169,11 @@
 				        		log.debug("removing role: "+currentRoleId);
 				        		iter3.remove();
 				        		//log.debug("num roles: "+uors.size());
-				        		uo.setUserOrganisationRoles(uors);
-				        		uos.add(uo);
-				        		user.setUserOrganisations(uos);
 				        	}
 				        }
+				        uo.setUserOrganisationRoles(uors);
+		        		uos.add(uo);
+		        		user.setUserOrganisations(uos);
 				        break;  // already found uo that matches this org
 				    }
 				}