Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java,v
diff -u -r1.50 -r1.51
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	3 Sep 2013 10:55:36 -0000	1.50
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	27 Apr 2016 15:01:56 -0000	1.51
@@ -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);
 		}
 	    }
 	}