Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java,v
diff -u -r1.10.2.7 -r1.10.2.8
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java	27 Mar 2017 18:40:52 -0000	1.10.2.7
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java	28 Mar 2017 09:48:37 -0000	1.10.2.8
@@ -346,6 +346,9 @@
 	} else {
 	    try {
 		Calendar now = Calendar.getInstance();
+		
+		Map<String, Object> searchParameters = new HashMap<String, Object>();
+		copySearchParametersFromRequestToMap(request, searchParameters);
 
 		// calculate scheduleDate
 		Date scheduleDateTeacherTimezone = new Date(scheduleDateParameter);
@@ -357,7 +360,7 @@
 			.withIdentity(EmailNotificationsAction.JOB_PREFIX_NAME + now.getTimeInMillis())
 			.withDescription("schedule email message to user(s)").usingJobData("emailBody", emailBody)
 			.build();
-		copySearchParametersFromRequestToMap(request, emailScheduleMessageJob.getJobDataMap());
+		searchParameters.forEach(emailScheduleMessageJob.getJobDataMap()::putIfAbsent);
 
 		// create customized triggers
 		Trigger startLessonTrigger = TriggerBuilder.newTrigger()
@@ -370,9 +373,9 @@
 		
 		//prepare data for audit log
 		scheduleDateStr = "on " + scheduleDate;
-		Object lessonIdObj = emailScheduleMessageJob.getJobDataMap().get(AttributeNames.PARAM_LESSON_ID);
-		Object lessonIDsObj = emailScheduleMessageJob.getJobDataMap().get("lessonIDs");
-		Object organisationIdObj = emailScheduleMessageJob.getJobDataMap().get(AttributeNames.PARAM_ORGANISATION_ID);
+		Object lessonIdObj = searchParameters.get(AttributeNames.PARAM_LESSON_ID);
+		Object lessonIDsObj = searchParameters.get("lessonIDs");
+		Object organisationIdObj = searchParameters.get(AttributeNames.PARAM_ORGANISATION_ID);
 		if (lessonIdObj != null) {
 		    emailClauseStr = "for lesson (lessonId: " + lessonIdObj + ")";
 		} else if (lessonIDsObj != null) {