Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
===================================================================
diff -u -rb128694883b5db515c3f98f6803b573e04d203d2 -r47b358c291ae6e0b867add83433f6b7088f68090
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision b128694883b5db515c3f98f6803b573e04d203d2)
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision 47b358c291ae6e0b867add83433f6b7088f68090)
@@ -177,7 +177,7 @@
 
 		// Adding gradebook course monitor links if enabled
 		if (org.getEnableGradebookForMonitors()
-			&& (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR))) {
+			&& (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_GROUP_ADMIN))) {
 		    String link = "javascript:showGradebookCourseDialog(" + org.getOrganisationId() + ")";
 		    moreLinks.add(new IndexLinkBean("index.coursegradebook", link, "course-gradebook-button",
 			    "index.coursegradebook.tooltip"));
@@ -194,7 +194,7 @@
 
 		// Adding gradebook course monitor links if enabled
 		if (org.getParentOrganisation().getEnableGradebookForMonitors()
-			&& (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_MONITOR))) {
+			&& (roles.contains(Role.ROLE_GROUP_MANAGER) || roles.contains(Role.ROLE_GROUP_ADMIN))) {
 		    String link = "javascript:showGradebookCourseDialog(" + org.getOrganisationId() + ")";
 		    moreLinks.add(new IndexLinkBean("index.coursegradebook.subgroup", link, "my-grades-button", null));
 		}
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
===================================================================
diff -u -rf83f367fdcf4b417d1ccbd74cca5dd88dc24df7a -r47b358c291ae6e0b867add83433f6b7088f68090
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java	(.../GradebookMonitoringAction.java)	(revision f83f367fdcf4b417d1ccbd74cca5dd88dc24df7a)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java	(.../GradebookMonitoringAction.java)	(revision 47b358c291ae6e0b867add83433f6b7088f68090)
@@ -46,6 +46,7 @@
 import org.lamsfoundation.lams.lesson.service.ILessonService;
 import org.lamsfoundation.lams.security.ISecurityService;
 import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
@@ -129,7 +130,8 @@
 		GradebookMonitoringAction.log.error("User missing from session. ");
 		return mapping.findForward("error");
 	    }
-	    if (!getSecurityService().isGroupMonitor(organisationID, user.getUserID(), "get course monitor", false)) {
+	    if (!getSecurityService().hasOrgRole(organisationID, user.getUserID(),
+		    new String[] { Role.GROUP_MANAGER, Role.GROUP_ADMIN }, "get course gradebook page", false)) {
 		response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the organisation");
 		return null;
 	    }