Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -r0c4713e27d5f9a122e1f71226dc98f72e7443fb1 -rab14bcf29a39e031cb4e844fcc49cfa9f7b216b7
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 0c4713e27d5f9a122e1f71226dc98f72e7443fb1)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision ab14bcf29a39e031cb4e844fcc49cfa9f7b216b7)
@@ -597,9 +597,11 @@
 
     @Override
     public void disableUser(Integer userId) {
-
 	User user = (User) findById(User.class, userId);
 	user.setDisabledFlag(true);
+	log.debug("disabling user " + user.getLogin());
+	saveUser(user);
+
 	Set uos = user.getUserOrganisations();
 	Iterator iter = uos.iterator();
 	while (iter.hasNext()) {
@@ -608,8 +610,6 @@
 	    delete(uo);
 	    iter.remove();
 	}
-	log.debug("disabling user " + user.getLogin());
-	saveUser(user);
     }
 
     @Override
@@ -1067,7 +1067,7 @@
 	    throw new IOException("/tmp/portraits is not readable");
 	}
 
-	List<String> uploadedPortraits = new LinkedList<String>();
+	List<String> uploadedPortraits = new LinkedList<>();
 	Integer prefixLength = StringUtils.isBlank(prefix) ? null : prefix.length() + 1;
 
 	for (int userId = minUserId; userId <= maxUserId; userId++) {