Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
diff -u -r606581007abbdaee5483777096f32ffac1c3e3eb -r2a5a90640296de05c2a984441fd327600e8955d5
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 2a5a90640296de05c2a984441fd327600e8955d5)
@@ -527,7 +527,10 @@
 		// not all orgs have a folder
 		Workspace workspace = userOrganisation.getOrganisation().getWorkspace();
 		if (workspace != null) {
-		    foundMemberFolder = checkFolders(workspace.getFolders(), workspaceFolderID);
+		    Set<WorkspaceFolder> folders = workspace.getFolders();
+		    // sometimes mapping is missing, make sure that the folder is taken into account
+		    folders.add(workspace.getDefaultFolder());
+		    foundMemberFolder = checkFolders(folders, workspaceFolderID);
 		}
 	    }
 	}