Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java =================================================================== diff -u -r0d168b0c1513ab8ab339fcd6f306b811a4fa9799 -rabc1a0de3ff4464f8822a340da120df2c3269119 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java (.../UserOrgSaveAction.java) (revision 0d168b0c1513ab8ab339fcd6f306b811a4fa9799) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserOrgSaveAction.java (.../UserOrgSaveAction.java) (revision abc1a0de3ff4464f8822a340da120df2c3269119) @@ -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());