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.13 -r1.13.16.1
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java	23 Nov 2006 05:53:49 -0000	1.13
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java	29 Nov 2009 22:42:32 -0000	1.13.16.1
@@ -104,11 +104,11 @@
 			UserOrganisation uo = (UserOrganisation)iter.next();
 			Integer userId = uo.getUser().getUserId();
 			if(userIdList.indexOf(userId.toString())<0){
-				iter.remove();
 				User user = (User)service.findById(User.class, userId);
 				Set userUos = user.getUserOrganisations();
 				userUos.remove(uo);
 				user.setUserOrganisations(userUos);
+				iter.remove();
 				log.debug("removed userId="+userId+" from orgId="+orgId);
 				// remove from subgroups
 				service.deleteChildUserOrganisations(uo.getUser(), uo.getOrganisation());