diff --git a/src/main/java/org/olat/commons/coordinate/cluster/jms/ClusterEventBus.java b/src/main/java/org/olat/commons/coordinate/cluster/jms/ClusterEventBus.java
index 6a374464e8f23d0e76c3c0f5ba1d51419ea25505..42bacb40554327c512dd04de3a9134b79d857d3f 100644
--- a/src/main/java/org/olat/commons/coordinate/cluster/jms/ClusterEventBus.java
+++ b/src/main/java/org/olat/commons/coordinate/cluster/jms/ClusterEventBus.java
@@ -207,6 +207,7 @@ public class ClusterEventBus extends AbstractEventBus implements MessageListener
 	/**
 	 * this implementation must sum up all counts from all cluster nodes to return the correct number. 
 	 */
+	@Override
 	public int getListeningIdentityCntFor(OLATResourceable ores) {
 		return busInfos.getListenerCountFor(ores);
 	}
@@ -216,18 +217,15 @@ public class ClusterEventBus extends AbstractEventBus implements MessageListener
 	 * @see org.olat.core.util.event.AbstractOLATSystemBus#fireEventToListenersOf(org.olat.core.util.event.MultiUserEvent,
 	 *      org.olat.core.id.OLATResourceable)
 	 */
+	@Override
 	public void fireEventToListenersOf(final MultiUserEvent event, final OLATResourceable ores) {
 		// send the event wrapped over jms to all nodes 
 		// (the receiver will detect whether messages are from itself and thus can be ignored, since they were already sent directly.
 		final long msgId = ++latestSentMsgId;
 		final Integer nodeId = clusterConfig.getNodeId();
 		
-		if(ores != null && ores.getResourceableId() != null
-				&& ores.getResourceableId().equals(0l) && "BusinessGroup".equals(ores.getResourceableTypeName())) {
-			System.out.println();
-		}
-		
 		jmsExecutor.execute(new Runnable() {
+			@Override
 			public void run() {
 				try {
 					ObjectMessage message = sessionProducer.createObjectMessage();
@@ -260,20 +258,8 @@ public class ClusterEventBus extends AbstractEventBus implements MessageListener
 	 * called by springs org.springframework.jms.listener.DefaultMessageListenerContainer, see coredefaultconfig.xml
 	 * we receive a message here on the topic reserved for olat system bus messages. 
 	 */
+	@Override
 	public void onMessage(Message message) {
-		/*synchronized(incomingMessagesQueue_) {
-			while(incomingMessagesQueue_.size()>LIMIT_ON_INCOMING_MESSAGE_QUEUE) {
-				try {
-					incomingMessagesQueue_.wait();
-				} catch (InterruptedException e) {
-					// this empty catch is okay
-				}
-			}
-			incomingMessagesQueue_.addFirst(message);
-			incomingMessagesQueue_.addFirst(System.currentTimeMillis());
-			incomingMessagesQueue_.notifyAll();
-		}*/
-		
 		try{
 			serveMessage(message, -1);
 		} catch(RuntimeException re) {
@@ -325,13 +311,6 @@ public class ClusterEventBus extends AbstractEventBus implements MessageListener
 			OLATResourceable ores = jmsWrapper.getOres();
 			boolean fromSameNode = clusterConfig.getNodeId().equals(nodeId);
 
-			//TODO jms update nodeinfo statistics, this doesn't work because we remove
-			//all the synchronization in the event bus
-			/* NodeInfo nodeInfo = getNodeInfoFor(nodeId);
-			if (log.isDebug() && !nodeInfo.update(jmsWrapper)) {
-				log.debug("onMessage: update failed. clustereventbus: "+this);
-			}*/
-
 			String recMsg = "received msg: "+(fromSameNode? "[same node]":"")+" from node:" + 
 			nodeId + ", olat-id:" + jmsWrapper.getMsgId() + ", ores:" + ores.getResourceableTypeName() + ":" + ores.getResourceableId() +
 			", event:"+event+"}";
diff --git a/src/main/java/org/olat/modules/reminder/ReminderModule.java b/src/main/java/org/olat/modules/reminder/ReminderModule.java
index 8897b11119733e9c3aae1bd7544d94bb38f01355..41d5017bbf883a1983a775ac93451501a37bd2bd 100644
--- a/src/main/java/org/olat/modules/reminder/ReminderModule.java
+++ b/src/main/java/org/olat/modules/reminder/ReminderModule.java
@@ -236,7 +236,8 @@ public class ReminderModule extends AbstractSpringModule {
 	public void setScheduler(String interval, String defaultSendTime) {
 		this.interval = interval;
 		this.defaultSendTime = defaultSendTime;
-		setStringProperty(INTERVAL, interval, true);
-		setStringProperty(SEND_TIME, defaultSendTime, true);
+		setStringProperty(INTERVAL, interval, false);
+		setStringProperty(SEND_TIME, defaultSendTime, false);
+		savePropertiesAndFireChangedEvent();
 	}
 }