Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java,v
diff -u -r1.33.2.10 -r1.33.2.11
--- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	5 Aug 2016 11:04:01 -0000	1.33.2.10
+++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java	30 Aug 2016 09:00:21 -0000	1.33.2.11
@@ -123,14 +123,11 @@
 	} else {
 	    courseName = extCourseId;
 	}
-	if (StringUtils.equals(method, LoginRequestDispatcher.METHOD_AUTHOR)
-		|| StringUtils.equals(method, LoginRequestDispatcher.METHOD_MONITOR)) {
-	    return getExtCourseClassMap(serverMap, userMap, extCourseId, courseName, countryIsoCode, langIsoCode,
-		    service.getRootOrganisation().getOrganisationId().toString(), true, prefix);
-	} else {
-	    return getExtCourseClassMap(serverMap, userMap, extCourseId, courseName, countryIsoCode, langIsoCode,
-		    service.getRootOrganisation().getOrganisationId().toString(), false, prefix);
-	}
+	
+	Boolean isTeacher = (StringUtils.equals(method, LoginRequestDispatcher.METHOD_AUTHOR)
+		|| StringUtils.equals(method, LoginRequestDispatcher.METHOD_MONITOR));
+	return getExtCourseClassMap(serverMap, userMap, extCourseId, courseName, countryIsoCode, langIsoCode,
+		service.getRootOrganisation().getOrganisationId().toString(), isTeacher, prefix);
     }
 
     // wrapper method for compatibility with original integration modules