Index: lams_central/src/java/org/lamsfoundation/lams/web/GradebookServlet.java
===================================================================
diff -u -r9aa66880a26014edebfaa94f6f763bcbbc26f27c -r8d246d6ebb45ba3f836d31ae65b37c9db3bc16de
--- lams_central/src/java/org/lamsfoundation/lams/web/GradebookServlet.java	(.../GradebookServlet.java)	(revision 9aa66880a26014edebfaa94f6f763bcbbc26f27c)
+++ lams_central/src/java/org/lamsfoundation/lams/web/GradebookServlet.java	(.../GradebookServlet.java)	(revision 8d246d6ebb45ba3f836d31ae65b37c9db3bc16de)
@@ -115,10 +115,9 @@
 
 		    // translate external course ID to internal organisation ID and then get the gradebook for it
 		    ExtUserUseridMap userMap = integrationService.getExtUserUseridMap(extServer, username);
-		    ExtCourseClassMap orgMap = integrationService.getExtCourseClassMap(extServer, userMap,
-			    extCourseId, courseName, countryIsoCode, langIsoCode,
-			    getUserManagementService().getRootOrganisation().getOrganisationId().toString(), isTeacher,
-			    false);
+		    ExtCourseClassMap orgMap = integrationService.getExtCourseClassMap(extServer, userMap, extCourseId,
+			    courseName, getUserManagementService().getRootOrganisation().getOrganisationId().toString(),
+			    isTeacher, false);
 		    Integer organisationId = orgMap.getOrganisation().getOrganisationId();
 		    
 		    //when displaying GRADEBOOK_MONITOR_ORGANISATION_URL we need to make sure user has ROLE_GROUP_MANAGER role
Index: lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupServlet.java
===================================================================
diff -u -r11b64f81e406ff277c7c35988304b0064300de57 -r8d246d6ebb45ba3f836d31ae65b37c9db3bc16de
--- lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupServlet.java	(.../OrganisationGroupServlet.java)	(revision 11b64f81e406ff277c7c35988304b0064300de57)
+++ lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupServlet.java	(.../OrganisationGroupServlet.java)	(revision 8d246d6ebb45ba3f836d31ae65b37c9db3bc16de)
@@ -98,7 +98,7 @@
 	    ExtUserUseridMap userMap = OrganisationGroupServlet.integrationService.getExtUserUseridMap(extServer,
 		    username);
 	    ExtCourseClassMap orgMap = OrganisationGroupServlet.integrationService.getExtCourseClassMap(extServer,
-		    userMap, courseId, null, null, null, LoginRequestDispatcher.METHOD_MONITOR);
+		    userMap, courseId, null, LoginRequestDispatcher.METHOD_MONITOR);
 	    user = userMap.getUser();
 	    organisation = orgMap.getOrganisation();