Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserBasicListAction.java
===================================================================
diff -u -r6452b7bb53f1f0eb5a340fd488a733a9a6bd1415 -r36301c5c3e71d8a4b4ca4e8ef5f7901abadf4e5e
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserBasicListAction.java	(.../UserBasicListAction.java)	(revision 6452b7bb53f1f0eb5a340fd488a733a9a6bd1415)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserBasicListAction.java	(.../UserBasicListAction.java)	(revision 36301c5c3e71d8a4b4ca4e8ef5f7901abadf4e5e)
@@ -89,11 +89,11 @@
 							// get users
 							List users = new ArrayList();
 							if (request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin()) {
-								users = service.getAllUsers(group.getOrganisationId());
+								users = service.getAllUsers(org.getOrganisationId());
 							} else if (service.isUserInRole(userId, group.getOrganisationId(), Role.GROUP_ADMIN)
 									|| service.isUserInRole(userId, group.getOrganisationId(), Role.GROUP_MANAGER)) {
 								if (group.getCourseAdminCanBrowseAllUsers()){
-									users = service.getAllUsers(group.getOrganisationId());
+									users = service.getAllUsers(org.getOrganisationId());
 								} else if (org.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)) {
 									users = service.getUsersFromOrganisation(group.getOrganisationId(), orgId);
 								}