diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
index 01da1dedd1..ac8d3b79c0 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
@@ -209,6 +209,9 @@ public class LoginPanel extends Window implements EventListener<Event>
             if (found)
             	break;
         }
+        
+        txtUserId.removeEventListener(Events.ON_FOCUS, txtUserId);
+        txtPassword.removeEventListener(Events.ON_FOCUS, txtPassword);
     }
 
 	protected void createUI() {