Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleSaveAction.java
===================================================================
diff -u -r175c255f30cd9bdfc07a0dbfa1cc4a4d466429e9 -rcc77d96c1c7fb5185915fc4e877cbd02f357364b
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleSaveAction.java	(.../UserOrgRoleSaveAction.java)	(revision 175c255f30cd9bdfc07a0dbfa1cc4a4d466429e9)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgRoleSaveAction.java	(.../UserOrgRoleSaveAction.java)	(revision cc77d96c1c7fb5185915fc4e877cbd02f357364b)
@@ -91,16 +91,17 @@
 			log.debug("userId: "+bean.getUserId());
 			String[] roleIds = bean.getRoleIds();
 			UserOrganisation uo = new UserOrganisation(getService().getUserByLogin(bean.getLogin()),(Organisation)getService().findById(Organisation.class, orgId));
+			getService().save(uo);
+			log.debug("added: "+uo.getUser().getUserId());
 			Set uors = new HashSet();
 			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());
 				UserOrganisationRole newUor = new UserOrganisationRole(uo,currentRole);
+				getService().save(newUor);
 				uors.add(newUor);
 			}
 			uo.setUserOrganisationRoles(uors);
-			getService().save(uo);
-			log.debug("added: "+uo.getUser().getUserId());
 		}
 		return mapping.findForward("userlist");
 	}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java
===================================================================
diff -u -re32f92f9f1bf4aeb3d539cf740742b1d4e6a528c -rcc77d96c1c7fb5185915fc4e877cbd02f357364b
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java	(.../UserSaveAction.java)	(revision e32f92f9f1bf4aeb3d539cf740742b1d4e6a528c)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java	(.../UserSaveAction.java)	(revision cc77d96c1c7fb5185915fc4e877cbd02f357364b)
@@ -156,6 +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);
 				        	}
 				        }