Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java
===================================================================
diff -u -rb6b7e0d17ca5842b71f38ade3515cc24379db619 -r6cf74cd12a39a5b5be353811131a83fdfa2cc9ae
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java	(.../OrgManageAction.java)	(revision b6b7e0d17ca5842b71f38ade3515cc24379db619)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java	(.../OrgManageAction.java)	(revision 6cf74cd12a39a5b5be353811131a83fdfa2cc9ae)
@@ -125,13 +125,12 @@
 				Organisation organisation = (Organisation)organisations.get(i);
 				Organisation parentOrg = (type.equals(OrganisationType.CLASS_TYPE)) ? organisation.getParentOrganisation() : organisation;
 				if (!request.isUserInRole(Role.SYSADMIN)) {
-					if (!getService().isUserInRole(userId, parentOrg.getOrganisationId(), Role.COURSE_ADMIN))
+					if (!(getService().isUserInRole(userId, parentOrg.getOrganisationId(), Role.COURSE_ADMIN)
+							|| getService().isUserInRole(userId, parentOrg.getOrganisationId(), Role.COURSE_MANAGER)))
 						continue;
-					if (!getService().isUserInRole(userId, parentOrg.getOrganisationId(), Role.COURSE_MANAGER))
-						continue;
 				}
 				if(type.equals(OrganisationType.CLASS_TYPE)){
-					if (organisation.getParentOrganisation().getOrganisationId() != orgId)
+					if (parentOrg.getOrganisationId() != orgId)
 						continue;
 				}
 				OrgManageBean orgManageBean = new OrgManageBean();