Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java
===================================================================
diff -u -rf56ae1d0483ef30155a4efb41cbae5a32435d1b2 -rb6b7e0d17ca5842b71f38ade3515cc24379db619
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java	(.../OrgManageAction.java)	(revision f56ae1d0483ef30155a4efb41cbae5a32435d1b2)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java	(.../OrgManageAction.java)	(revision b6b7e0d17ca5842b71f38ade3515cc24379db619)
@@ -110,19 +110,26 @@
 		List<OrgManageBean> orgManageBeans = new ArrayList<OrgManageBean>();
 		//if(getService().isUserSysAdmin(username)){
 		Integer userId = ((UserDTO)SessionManager.getSession().getAttribute(AttributeNames.USER)).getUserID();
-		if(request.isUserInRole(Role.SYSADMIN) || getService().isUserInRole(userId, orgId, Role.COURSE_ADMIN) || getService().isUserInRole(userId, orgId, Role.COURSE_MANAGER)){
+		if(request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.COURSE_ADMIN) || request.isUserInRole(Role.COURSE_MANAGER)){
 			Integer type;
 			if(orgManageForm.getType().equals(OrganisationType.ROOT_TYPE)){
 				type = OrganisationType.COURSE_TYPE;
 			}else{
 				type = OrganisationType.CLASS_TYPE;
 			}
 			List organisations = getService().findByProperty(Organisation.class,"organisationType.organisationTypeId",type);
-			log.debug("user is sysadmin");
-			log.debug("Got "+organisations.size()+" organsiations");
+			log.debug("user is an admin or manager");
+			log.debug("Got "+organisations.size()+" organisations");
 			log.debug("organisationType is "+type);
 			for(int i=0; i<organisations.size(); i++){
 				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))
+						continue;
+					if (!getService().isUserInRole(userId, parentOrg.getOrganisationId(), Role.COURSE_MANAGER))
+						continue;
+				}
 				if(type.equals(OrganisationType.CLASS_TYPE)){
 					if (organisation.getParentOrganisation().getOrganisationId() != orgId)
 						continue;
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
diff -u -r4c885f9ce404071ebdb626b74499543010776361 -rb6b7e0d17ca5842b71f38ade3515cc24379db619
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision 4c885f9ce404071ebdb626b74499543010776361)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision b6b7e0d17ca5842b71f38ade3515cc24379db619)
@@ -84,8 +84,8 @@
 			List<IndexLinkBean> headerLinks = new ArrayList<IndexLinkBean>();
 			//headerLinks.add(new IndexLinkBean("index.dummymonitor","javascript:openDummyMonitor()"));
 			headerLinks.add(new IndexLinkBean("index.myprofile", "javascript:openProfile('" + request.getRemoteUser()+"')"));
-			if (request.isUserInRole(Role.SYSADMIN)) {
-				log.debug("user is sysadmin");
+			if (request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.COURSE_ADMIN) || request.isUserInRole(Role.COURSE_MANAGER)) {
+				log.debug("user is an admin or manager");
 				headerLinks.add(new IndexLinkBean("index.sysadmin", "javascript:openSysadmin()"));
 				headerLinks.add(new IndexLinkBean("index.courseman", "javascript:openOrgManagement(" + getService().getRootOrganisation().getOrganisationId()+")"));
 			}