Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml,v
diff -u -r1.36.2.11 -r1.36.2.12
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	4 Mar 2016 13:40:52 -0000	1.36.2.11
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	1 Apr 2016 11:55:58 -0000	1.36.2.12
@@ -76,6 +76,7 @@
 				<prop key="force*">PROPAGATION_REQUIRED</prop>
 				<prop key="check*">PROPAGATION_REQUIRED,readOnly</prop>
 				<prop key="setGroupName">PROPAGATION_REQUIRED</prop>
+				<prop key="toggle*">PROPAGATION_REQUIRED</prop>
 			</props>
 		</property>
 	</bean>    
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java,v
diff -u -r1.110.2.12 -r1.110.2.13
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	16 Mar 2016 12:12:46 -0000	1.110.2.12
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	1 Apr 2016 11:55:58 -0000	1.110.2.13
@@ -235,7 +235,7 @@
      * @return new value for learnerPresenceAvailable. Normally will be same as input parameter, will only be different
      *         if the value cannot be updated for some reason.
      */
-    Boolean setPresenceAvailable(long lessonId, Integer userId, Boolean learnerPresenceAvailable);
+    Boolean togglePresenceAvailable(long lessonId, Integer userId, Boolean learnerPresenceAvailable);
 
     /**
      * Set whether or not the learner IM button is available in monitor. Checks that the user is a staff member of this
@@ -247,7 +247,7 @@
      * @return new value for learnerPresenceImAvailable. Normally will be same as input parameter, will only be
      *         different if the value cannot be updated for some reason.
      */
-    Boolean setPresenceImAvailable(long lessonId, Integer userId, Boolean learnerPresenceImAvailable);
+    Boolean togglePresenceImAvailable(long lessonId, Integer userId, Boolean learnerPresenceImAvailable);
 
     /**
      * Set whether or not the live edit is available in monitor. Checks that the user is a staff member of this lesson
@@ -259,7 +259,7 @@
      * @return new value for liveEditEnabled. Normally will be same as input parameter, will only be different if the
      *         value cannot be updated for some reason.
      */
-    Boolean setLiveEditEnabled(long lessonId, Integer userId, Boolean liveEditEnabled);
+    Boolean toggleLiveEditEnabled(long lessonId, Integer userId, Boolean liveEditEnabled);
 
     String forceCompleteActivitiesByUser(Integer learnerId, Integer requesterId, long lessonId, Long activityId,
 	    boolean removeLearnerContent);
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v
diff -u -r1.195.2.25 -r1.195.2.26
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	16 Mar 2016 12:12:46 -0000	1.195.2.25
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	1 Apr 2016 11:55:58 -0000	1.195.2.26
@@ -926,7 +926,7 @@
     }
 
     @Override
-    public Boolean setPresenceAvailable(long lessonId, Integer userId, Boolean presenceAvailable) {
+    public Boolean togglePresenceAvailable(long lessonId, Integer userId, Boolean presenceAvailable) {
 	securityService.isLessonMonitor(lessonId, userId, "set presence available", true);
 	Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId));
 	requestedLesson.setLearnerPresenceAvailable(presenceAvailable != null ? presenceAvailable : Boolean.FALSE);
@@ -935,7 +935,7 @@
     }
 
     @Override
-    public Boolean setPresenceImAvailable(long lessonId, Integer userId, Boolean presenceImAvailable) {
+    public Boolean togglePresenceImAvailable(long lessonId, Integer userId, Boolean presenceImAvailable) {
 	securityService.isLessonMonitor(lessonId, userId, "set presence instant messaging available", true);
 	Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId));
 	requestedLesson.setLearnerImAvailable(presenceImAvailable != null ? presenceImAvailable : Boolean.FALSE);
@@ -944,7 +944,7 @@
     }
 
     @Override
-    public Boolean setLiveEditEnabled(long lessonId, Integer userId, Boolean liveEditEnabled) {
+    public Boolean toggleLiveEditEnabled(long lessonId, Integer userId, Boolean liveEditEnabled) {
 	securityService.isLessonMonitor(lessonId, userId, "set live edit available", true);
 	Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId));
 	requestedLesson.setLiveEditEnabled(liveEditEnabled != null ? liveEditEnabled : Boolean.FALSE);
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v
diff -u -r1.118.2.33 -r1.118.2.34
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	16 Mar 2016 12:12:46 -0000	1.118.2.33
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	1 Apr 2016 11:55:58 -0000	1.118.2.34
@@ -1465,10 +1465,10 @@
 	Boolean presenceAvailable = WebUtil.readBooleanParam(request, "presenceAvailable", false);
 
 	try {
-	    getMonitoringService().setPresenceAvailable(lessonID, userID, presenceAvailable);
+	    getMonitoringService().togglePresenceAvailable(lessonID, userID, presenceAvailable);
 
 	    if (!presenceAvailable) {
-		getMonitoringService().setPresenceImAvailable(lessonID, userID, false);
+		getMonitoringService().togglePresenceImAvailable(lessonID, userID, false);
 	    }
 	} catch (SecurityException e) {
 	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the lesson");
@@ -1487,7 +1487,7 @@
 	Boolean presenceImAvailable = WebUtil.readBooleanParam(request, "presenceImAvailable", false);
 
 	try {
-	    getMonitoringService().setPresenceImAvailable(lessonID, userID, presenceImAvailable);
+	    getMonitoringService().togglePresenceImAvailable(lessonID, userID, presenceImAvailable);
 	} catch (SecurityException e) {
 	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the lesson");
 	}