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.5 -r1.6
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java	26 Jul 2006 08:06:23 -0000	1.5
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java	1 Aug 2006 07:31:15 -0000	1.6
@@ -102,6 +102,10 @@
 			Integer userId = uo.getUser().getUserId();
 			if(userIdList.indexOf(userId.toString())<0){
 				iter.remove();
+				User user = (User)getService().findById(User.class, userId);
+				Set userUos = user.getUserOrganisations();
+				userUos.remove(uo);
+				user.setUserOrganisations(userUos);
 				log.debug("removed: "+userId);
 			}
 		}
@@ -120,9 +124,6 @@
 			if(!alreadyInOrg){
 				User user = (User)getService().findById(User.class,userId);
 				UserOrganisation uo = new UserOrganisation(user,organisation);
-				getService().save(uo);
-				uos.add(uo);
-				log.debug("added: "+userId);
 				newUserOrganisations.add(uo);
 				/*Role role = (Role)getService().findByProperty(Role.class,"name",Role.LEARNER).get(0);
 		        UserOrganisationRole uor = new UserOrganisationRole(uo,role);