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.2.4 -r1.50.2.5 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java 13 Apr 2016 08:48:37 -0000 1.50.2.4 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java 27 Apr 2016 15:03:12 -0000 1.50.2.5 @@ -515,7 +515,10 @@ // not all orgs have a folder Workspace workspace = userOrganisation.getOrganisation().getWorkspace(); if (workspace != null) { - foundMemberFolder = checkFolders(workspace.getFolders(), workspaceFolderID); + Set folders = workspace.getFolders(); + // sometimes mapping is missing, make sure that the folder is taken into account + folders.add(workspace.getDefaultFolder()); + foundMemberFolder = checkFolders(folders, workspaceFolderID); } } }