diff --git a/org.adempiere.base/src/org/idempiere/broadcast/BroadCastMsg.java b/org.adempiere.base/src/org/idempiere/broadcast/BroadCastMsg.java
index c37b35598b..073c9a6d08 100644
--- a/org.adempiere.base/src/org/idempiere/broadcast/BroadCastMsg.java
+++ b/org.adempiere.base/src/org/idempiere/broadcast/BroadCastMsg.java
@@ -32,16 +32,6 @@ public class BroadCastMsg implements Serializable {
 	private String target;
 	private int eventId;
 	
-	private boolean fromCluster = false;
-	
-	public boolean isFromCluster() {
-		return fromCluster;
-	}
-
-	public void setFromCluster(boolean fromCluster) {
-		this.fromCluster = fromCluster;
-	}
-
 	public int getEventId() {
 		return eventId;
 	}
diff --git a/org.adempiere.base/src/org/idempiere/broadcast/BroadCastUtil.java b/org.adempiere.base/src/org/idempiere/broadcast/BroadCastUtil.java
index fe71bbb52c..933074a2ed 100644
--- a/org.adempiere.base/src/org/idempiere/broadcast/BroadCastUtil.java
+++ b/org.adempiere.base/src/org/idempiere/broadcast/BroadCastUtil.java
@@ -49,13 +49,15 @@ public class BroadCastUtil {
 		}
 	}
 	
-	public static void publish(BroadCastMsg msg){
+	public static boolean publish(BroadCastMsg msg){
 		
 		IServiceHolder<IMessageService> holder = Service.locator().locate(IMessageService.class);
 		IMessageService service = holder.getService();
 		if (service != null) {
 			ITopic<BroadCastMsg> topic= service.getTopic(TOPIC_BROADCAST_MESSAGE);
 			topic.publish(msg);
+			return true;
 		}
+		return false;
 	}
 }
diff --git a/org.adempiere.base/src/org/idempiere/broadcast/BroadcastMsgUtil.java b/org.adempiere.base/src/org/idempiere/broadcast/BroadcastMsgUtil.java
index 9b2f582a28..3a08aed62d 100644
--- a/org.adempiere.base/src/org/idempiere/broadcast/BroadcastMsgUtil.java
+++ b/org.adempiere.base/src/org/idempiere/broadcast/BroadcastMsgUtil.java
@@ -17,16 +17,20 @@ package org.idempiere.broadcast;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.ArrayList;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 
 import org.adempiere.base.event.EventManager;
 import org.adempiere.base.event.IEventTopics;
 import org.adempiere.exceptions.DBException;
 import org.adempiere.model.MBroadcastMessage;
+import org.compiere.Adempiere;
 import org.compiere.model.MNote;
 import org.compiere.util.CLogger;
 import org.compiere.util.DB;
 import org.compiere.util.Env;
+import org.compiere.util.WebUtil;
 
 /**
  * 
@@ -48,6 +52,7 @@ public class BroadcastMsgUtil
 	 * @param trxName
 	 */
 	public static void publishBroadcastMessage(final int messageID, String trxName) {
+		
 		MBroadcastMessage mbMessage = MBroadcastMessage.get(Env.getCtx(), messageID);
 		String broadcastType = mbMessage.getBroadcastType();
 		
@@ -89,26 +94,37 @@ public class BroadcastMsgUtil
 			BroadCastMsg msg = new BroadCastMsg();
 			msg.setIntData(messageID);
 			msg.setEventId(BroadCastUtil.EVENT_BROADCAST_MESSAGE);
-			pushToQueue(msg);
+			
+			pushToQueue(msg,false);
 		}
 	
 	}
 
-	public static void pushToQueue(final BroadCastMsg msg){
-		Runnable runnable = new Runnable() {
-			
-			@Override
-			public void run() {
+	public static void pushToQueue(final BroadCastMsg msg, boolean isLocalOnly) {
 
-				org.osgi.service.event.Event event = EventManager.newEvent(IEventTopics.BROADCAST_MESSAGE, msg);
-				EventManager.getInstance().postEvent(event);
-				
-			}
-		};
-		
-		Thread thread = new Thread(runnable);
-		thread.setName("PublishMessage -" + Env.getContextAsInt(Env.getCtx(), "AD_Session_ID"));
-		thread.start();
+		boolean isPublished = false;
+		if (!isLocalOnly) {
+			msg.setSrc(WebUtil.getServerName());
+			isPublished = BroadCastUtil.publish(msg);
+
+		}
+
+		if (!isPublished) {
+			Runnable runnable = new Runnable() {
+
+				@Override
+				public void run() {
+
+					org.osgi.service.event.Event event = EventManager.newEvent(
+							IEventTopics.BROADCAST_MESSAGE, msg);
+					EventManager.getInstance().postEvent(event);
+				}
+			};
+
+			ScheduledThreadPoolExecutor executer = Adempiere
+					.getThreadPoolExecutor();
+			executer.schedule(runnable, 0, TimeUnit.MILLISECONDS);
+		}
 	}
 	/**
 	 * Test message
@@ -118,11 +134,10 @@ public class BroadcastMsgUtil
 	public static void testBroadcastMessage(int messageID, int AD_Session_ID) {
 		BroadCastMsg msg = new BroadCastMsg();
 		msg.setIntData(messageID);
-		msg.setFromCluster(true);
 		msg.setEventId(BroadCastUtil.EVENT_TEST_BROADCAST_MESSAGE);
 		msg.setTarget(Integer.toString(AD_Session_ID));
 
-		pushToQueue(msg);
+		pushToQueue(msg,true);
 	}
 
 
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index dbe6f298e3..26de9579b0 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.adempiere.server.application"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/server.product"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-server.product"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.adempiere.server.server_product"/>
-<stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
-<stringAttribute key="selected_target_plugins" value="com.springsource.javax.activation@default:default,com.springsource.javax.ejb@default:default,com.springsource.javax.jms@default:default,com.springsource.javax.mail@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.javax.persistence@default:default,com.springsource.javax.transaction@default:default,com.springsource.javax.xml.bind@default:default,com.springsource.javax.xml.rpc@default:default,com.springsource.javax.xml.soap@default:default,com.springsource.javax.xml.stream@default:default,com.springsource.net.sf.cglib@default:default,com.springsource.org.aopalliance@default:default,com.springsource.org.apache.activemq@default:default,com.springsource.org.apache.catalina.ha@default:false,com.springsource.org.apache.catalina.tribes@default:false,com.springsource.org.apache.catalina@default:default,com.springsource.org.apache.commons.logging@default:default,com.springsource.org.apache.coyote@default:false,com.springsource.org.apache.el@default:default,com.springsource.org.apache.jasper@default:false,com.springsource.org.apache.juli.extras@default:default,com.springsource.org.apache.kahadb@default:default,com.springsource.org.apache.tomcat.api@default:default,com.springsource.org.apache.tomcat.util@default:false,com.springsource.org.apache.xmlcommons@default:default,com.springsource.org.eclipse.jdt.core.compiler.batch@default:default,com.springsource.slf4j.api@default:default,com.springsource.slf4j.jcl@default:false,com.springsource.slf4j.nop@default:false,javax.annotation@default:default,javax.el@default:default,javax.servlet.jsp.jstl@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.taglibs.standard.glassfish@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gemini.web.core@4:true,org.eclipse.gemini.web.extender@4:true,org.eclipse.gemini.web.tomcat@4:true,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.eclipse.virgo.util.common@default:default,org.eclipse.virgo.util.io@default:default,org.eclipse.virgo.util.math@default:default,org.eclipse.virgo.util.osgi@default:default,org.eclipse.virgo.util.parser.manifest@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.springframework.aop@default:default,org.springframework.beans@default:default,org.springframework.context@default:default,org.springframework.core@default:default,org.springframework.osgi.core@default:default,org.springframework.osgi.io@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.eclipse.equinox.http.servletbridge@default:true,org.adempiere.eclipse.equinox.servletbridge@default:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.font.demo@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:default,org.adempiere.server@4:true,org.adempiere.tomcat.config@default:false,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:default,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.apache.poi@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitnesse.fixture@default:default,org.idempiere.fitnesse.server@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@default:default,org.zkoss.zk.library@default:true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
+<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.adempiere.server.application"/>
+<booleanAttribute key="askclear" value="true"/>
+<booleanAttribute key="automaticAdd" value="false"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="false"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/server.product"/>
+<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../runtime-server.product"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.adempiere.server.server_product"/>
+<stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
+<stringAttribute key="selected_target_plugins" value="com.springsource.javax.activation@default:default,com.springsource.javax.ejb@default:default,com.springsource.javax.jms@default:default,com.springsource.javax.mail@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.javax.persistence@default:default,com.springsource.javax.transaction@default:default,com.springsource.javax.xml.bind@default:default,com.springsource.javax.xml.rpc@default:default,com.springsource.javax.xml.soap@default:default,com.springsource.javax.xml.stream@default:default,com.springsource.net.sf.cglib@default:default,com.springsource.org.aopalliance@default:default,com.springsource.org.apache.activemq@default:default,com.springsource.org.apache.catalina.ha@default:false,com.springsource.org.apache.catalina.tribes@default:false,com.springsource.org.apache.catalina@default:default,com.springsource.org.apache.commons.logging@default:default,com.springsource.org.apache.coyote@default:false,com.springsource.org.apache.el@default:default,com.springsource.org.apache.jasper@default:false,com.springsource.org.apache.juli.extras@default:default,com.springsource.org.apache.kahadb@default:default,com.springsource.org.apache.tomcat.api@default:default,com.springsource.org.apache.tomcat.util@default:false,com.springsource.org.apache.xmlcommons@default:default,com.springsource.org.eclipse.jdt.core.compiler.batch@default:default,com.springsource.slf4j.api@default:default,com.springsource.slf4j.jcl@default:false,com.springsource.slf4j.nop@default:false,javax.annotation@default:default,javax.el@default:default,javax.servlet.jsp.jstl@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.poi@default:default,org.apache.taglibs.standard.glassfish@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime@4:true,org.eclipse.core.variables@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@3:true,org.eclipse.equinox.event@3:true,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gemini.web.core@4:true,org.eclipse.gemini.web.extender@4:true,org.eclipse.gemini.web.tomcat@4:true,org.eclipse.osgi.services@3:true,org.eclipse.osgi@-1:true,org.eclipse.virgo.util.common@default:default,org.eclipse.virgo.util.io@default:default,org.eclipse.virgo.util.math@default:default,org.eclipse.virgo.util.osgi@default:default,org.eclipse.virgo.util.parser.manifest@default:default,org.hamcrest.core@default:default,org.junit@default:default,org.restlet.ext.servlet@default:default,org.restlet@4:true,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.springframework.aop@default:default,org.springframework.beans@default:default,org.springframework.context@default:default,org.springframework.core@default:default,org.springframework.osgi.core@default:default,org.springframework.osgi.io@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.adempiere.base.callout@default:default,org.adempiere.base.process@default:default,org.adempiere.base@4:true,org.adempiere.eclipse.equinox.http.servlet@default:true,org.adempiere.eclipse.equinox.http.servletbridge@default:true,org.adempiere.eclipse.equinox.servletbridge@default:true,org.adempiere.extend@default:false,org.adempiere.install@4:true,org.adempiere.payment.processor@default:default,org.adempiere.pipo.handlers@default:default,org.adempiere.pipo@default:default,org.adempiere.plugin.utils@default:default,org.adempiere.replication.server@4:true,org.adempiere.replication@default:default,org.adempiere.report.jasper.font.demo@default:default,org.adempiere.report.jasper.library@default:default,org.adempiere.report.jasper.webapp@4:true,org.adempiere.report.jasper@default:default,org.adempiere.server@4:true,org.adempiere.tomcat.config@default:false,org.adempiere.ui.zk@4:true,org.adempiere.ui@default:default,org.adempiere.webstore.resource@default:false,org.adempiere.webstore.servlet@default:default,org.adempiere.webstore@4:true,org.apache.ecs@default:default,org.apache.poi@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.idempiere.fitnesse.fixture@default:default,org.idempiere.fitnesse.server@default:default,org.idempiere.hazelcast.service.config@default:false,org.idempiere.hazelcast.service@default:true,org.idempiere.webservices@default:default,org.zkoss.zk.library@default:true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="true"/>
+<booleanAttribute key="usefeatures" value="false"/>
+</launchConfiguration>
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
index 909b64811a..c0a4ff773e 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
@@ -325,8 +325,7 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
 	 * @param eventManager
 	 */
 	public void bindEventManager() {
-		String topics [] = {IEventTopics.BROADCAST_MESSAGE};
-		EventManager.getInstance().register(topics, this);
+		EventManager.getInstance().register(IEventTopics.BROADCAST_MESSAGE, this);
 	}
 
 	/**
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ZKBroadCastManager.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ZKBroadCastManager.java
index 66484c709f..1a5b96d135 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ZKBroadCastManager.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/event/ZKBroadCastManager.java
@@ -14,20 +14,17 @@
 
 package org.adempiere.webui.event;
 
-import org.adempiere.base.event.EventManager;
-import org.adempiere.base.event.IEventTopics;
 import org.compiere.util.WebUtil;
 import org.idempiere.broadcast.BroadCastMsg;
 import org.idempiere.broadcast.BroadCastUtil;
 import org.idempiere.broadcast.BroadcastMsgUtil;
 import org.idempiere.distributed.ITopicSubscriber;
-import org.osgi.service.event.EventHandler;
 /**
  * Class Manages Broadcast Messages across webui cluster
  * @author Deepak Pansheriya
  *
  */
-public class ZKBroadCastManager implements ITopicSubscriber<BroadCastMsg>,EventHandler{
+public class ZKBroadCastManager implements ITopicSubscriber<BroadCastMsg>{
 
 	private static ZKBroadCastManager broadCastMgr = null;
 	
@@ -42,7 +39,6 @@ public class ZKBroadCastManager implements ITopicSubscriber<BroadCastMsg>,EventH
 	}
 	
 	private ZKBroadCastManager(){
-		EventManager.getInstance().register(IEventTopics.BROADCAST_MESSAGE, this);
 		BroadCastUtil.subscribe(this);
 	}
 	
@@ -52,41 +48,19 @@ public class ZKBroadCastManager implements ITopicSubscriber<BroadCastMsg>,EventH
 	 */
 	@Override
 	public void onMessage(BroadCastMsg message) {
-		
-		if(!WebUtil.getServerName().equalsIgnoreCase(message.getSrc())){
-			switch(message.getEventId()){
-			case BroadCastUtil.EVENT_BROADCAST_MESSAGE:
-				message.setFromCluster(true);
-				BroadcastMsgUtil.pushToQueue(message);
-				break;
-			case BroadCastUtil.EVENT_SESSION_TIMEOUT:
-				message.setFromCluster(true);
-				BroadcastMsgUtil.pushToQueue(message);
-				break;
-			case BroadCastUtil.EVENT_SESSION_ONNODE_TIMEOUT:
-				if(WebUtil.getServerName().equalsIgnoreCase(message.getTarget())){
-					message.setFromCluster(true);
-					BroadcastMsgUtil.pushToQueue(message);
-				}
-				break;
-			}
-		}
-	}
 
-	/**
-	 * OSGI Event Handler
-	 */
-	@Override
-	public void handleEvent(org.osgi.service.event.Event event) {
-		BroadCastMsg msg = (BroadCastMsg) event
-				.getProperty(EventManager.EVENT_DATA);
-		// Avoid loop
-		if (msg.isFromCluster())
-			return;
-		if (msg.getEventId() == BroadCastUtil.EVENT_BROADCAST_MESSAGE) {
-			msg.setSrc(WebUtil.getServerName());
-			msg.setEventId(BroadCastUtil.EVENT_BROADCAST_MESSAGE);
-			BroadCastUtil.publish(msg);
+		switch (message.getEventId()) {
+		case BroadCastUtil.EVENT_BROADCAST_MESSAGE:
+			BroadcastMsgUtil.pushToQueue(message, true);
+			break;
+		case BroadCastUtil.EVENT_SESSION_TIMEOUT:
+			BroadcastMsgUtil.pushToQueue(message, true);
+			break;
+		case BroadCastUtil.EVENT_SESSION_ONNODE_TIMEOUT:
+			if (WebUtil.getServerName().equalsIgnoreCase(message.getTarget())) {
+				BroadcastMsgUtil.pushToQueue(message, true);
+			}
+			break;
 		}
 	}
 }
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TimeoutPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TimeoutPanel.java
index ca3ccdfc57..03f5861b42 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TimeoutPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TimeoutPanel.java
@@ -14,6 +14,7 @@
 
 package org.adempiere.webui.panel;
 
+import org.adempiere.webui.session.SessionManager;
 import org.zkoss.zhtml.Script;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.Session;
@@ -140,8 +141,7 @@ public class TimeoutPanel extends Window implements
 		if (event.getName().equals("onTimer")) 
 		{
 				timer.stop();
-				Session session = Sessions.getCurrent();
-				session.invalidate();
+				SessionManager.logoutSession();
 				Executions.sendRedirect("/index.zul");
 		}
 	}
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/KillAllSession.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/KillAllSession.java
index 7ab352ad03..bfadfc6f41 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/KillAllSession.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/KillAllSession.java
@@ -65,7 +65,7 @@ public class KillAllSession extends SvrProcess {
 				msg.setEventId(BroadCastUtil.EVENT_SESSION_ONNODE_TIMEOUT);
 				msg.setIntData(scndTimeout);
 				msg.setTarget(rs.getString("servername"));
-				BroadcastMsgUtil.pushToQueue(msg);
+				BroadcastMsgUtil.pushToQueue(msg,false);
 			}
 		} catch (Exception e) {
 			logger.log(Level.SEVERE, "servername could not be retrieved", e);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/KillCurrentSession.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/KillCurrentSession.java
index efac641b50..cd3924ba23 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/KillCurrentSession.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/KillCurrentSession.java
@@ -48,7 +48,7 @@ public class KillCurrentSession extends SvrProcess {
 		msg.setEventId(BroadCastUtil.EVENT_SESSION_TIMEOUT);
 		msg.setIntData(scndTimeout);
 		msg.setTarget(Integer.toString(getRecord_ID()));
-		BroadcastMsgUtil.pushToQueue(msg);
+		BroadcastMsgUtil.pushToQueue(msg,false);
 		
 		return "Session notified";
 	}