diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/sso/filter/SSOWebUIFilter.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/sso/filter/SSOWebUIFilter.java
index 49ae97723c..7167a33749 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/sso/filter/SSOWebUIFilter.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/sso/filter/SSOWebUIFilter.java
@@ -65,6 +65,14 @@ public class SSOWebUIFilter implements Filter
 			HttpServletRequest httpRequest = (HttpServletRequest) request;
 			HttpServletResponse httpResponse = (HttpServletResponse) response;
 
+			//handle ping request
+			String ping = httpRequest.getHeader("X-PING");
+			if (!Util.isEmpty(ping, true))
+			{
+				chain.doFilter(request, response);
+				return;
+			}
+			
 			// Ignore the resource request	
 			if (SSOUtils.isResourceRequest(httpRequest, true))
 			{
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/LoginWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/LoginWindow.java
index 91e491cc7c..669d4ba8c8 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/LoginWindow.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/LoginWindow.java
@@ -211,15 +211,7 @@ public class LoginWindow extends Window implements EventListener<Event>
 			pnlRole = new RolePanel(ctx, this, userName, show, clientsKNPairs, isClientDefined);
 		if (isSSOLogin)
 		{
-			this.addEventListener(SSOUtils.EVENT_ON_AFTER_SSOLOGIN, new EventListener<Event>() {
-
-				@Override
-				public void onEvent(Event arg0) throws Exception
-				{
-					validateMFPanel(userName, show, clientsKNPairs, isClientDefined);
-				}
-			});
-			Events.echoEvent(SSOUtils.EVENT_ON_AFTER_SSOLOGIN, this, null);
+			Executions.schedule(getDesktop(), e -> validateMFPanel(userName, show, clientsKNPairs, isClientDefined), new Event(SSOUtils.EVENT_ON_AFTER_SSOLOGIN));
 		}
 		else
 		{