@@ -185,10 +185,14 @@
     public Collection getAllUsers() {
         Collection users = new ArrayList();
         try {
-            Collection nodes = getHierarchyManager().getRoot().getChildren(ItemType.USER);
-            for (Iterator iter = nodes.iterator(); iter.hasNext();) {
-                users.add(new MgnlUser((Content) iter.next()));
-            }
+            Iterator nodes = getHierarchyManager().getRoot().getChildren(ItemType.FOLDER).iterator();
+            while (nodes.hasNext()) {
+				Content realmFolder = (Content) nodes.next();
+				Iterator usersList = realmFolder.getChildren(ItemType.USER).iterator();
+				while (usersList.hasNext()) {
+					users.add(new MgnlUser((Content) usersList.next()));					
+				}
+			}
         }
         catch (Exception e) {
             log.error("can't find user");