Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java,v
diff -u -r1.55 -r1.56
--- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java	14 May 2015 12:04:51 -0000	1.55
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java	3 Jun 2015 00:03:16 -0000	1.56
@@ -114,23 +114,20 @@
 	String datetime = request.getParameter(CentralConstants.PARAM_DATE_TIME);
 	String hashValue = request.getParameter(CentralConstants.PARAM_HASH_VALUE);
 	String username = request.getParameter(CentralConstants.PARAM_USERNAME);
+	String courseId = request.getParameter(CentralConstants.PARAM_COURSE_ID);
 	String ldIdStr = request.getParameter(CentralConstants.PARAM_LEARNING_DESIGN_ID);
 	String lsIdStr = request.getParameter(CentralConstants.PARAM_LESSON_ID);
 	String country = request.getParameter(CentralConstants.PARAM_COUNTRY);
 	String title = request.getParameter(CentralConstants.PARAM_TITLE);
 	String desc = request.getParameter(CentralConstants.PARAM_DESC);
 	String startDate = request.getParameter(CentralConstants.PARAM_STARTDATE);
 	String lang = request.getParameter(CentralConstants.PARAM_LANG);
+	String method = request.getParameter(CentralConstants.PARAM_METHOD);
 	String filePath = request.getParameter(CentralConstants.PARAM_FILEPATH);
 	String outputsUser = request.getParameter("outputsUser");
 	String learnerIds = request.getParameter(CentralConstants.PARAM_LEARNER_IDS);
 	String monitorIds = request.getParameter(CentralConstants.PARAM_MONITOR_IDS);
 
-	String method = request.getParameter(CentralConstants.PARAM_METHOD);
-
-	/** CourseId isn't needed for a preview, but it is needed for the other calls */
-	String courseId = WebUtil.readStrParam(request, CentralConstants.PARAM_COURSE_ID, method.equals(CentralConstants.METHOD_PREVIEW));
-
 	// Custom CSV string to be used for tool adapters
 	String customCSV = request.getParameter(CentralConstants.PARAM_CUSTOM_CSV);
 
@@ -535,6 +532,8 @@
 	    ExtServerOrgMap serverMap = LessonManagerServlet.integrationService.getExtServerOrgMap(serverId);
 	    Authenticator.authenticate(serverMap, datetime, username, hashValue);
 	    ExtUserUseridMap userMap = LessonManagerServlet.integrationService.getExtUserUseridMap(serverMap, username);
+	    ExtCourseClassMap orgMap = LessonManagerServlet.integrationService.getExtCourseClassMap(serverMap, userMap,
+		    courseId, countryIsoCode, langIsoCode, null, LoginRequestDispatcher.METHOD_MONITOR);
 	    Integer userId = userMap.getUser().getUserId();
 
 	    // 1. init lesson