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 f92dbecaeb..dae2559759 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
@@ -174,6 +174,8 @@ public class LoginPanel extends Window implements EventListener<Event>
 							    			}
 							    		}
 								    	onUserIdChange(AD_User_ID);
+								    	if (txtUserId.getValue().length() > 0)
+								    		txtPassword.focus();
 								    	chkRememberMe.setChecked(true);
 							    	}
 							    	if (MSystem.isZKRememberPasswordAllowed()) {