diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java
index 2a582fe788..f3ce537df4 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java
@@ -45,6 +45,7 @@ import org.zkoss.zhtml.Td;
 import org.zkoss.zhtml.Tr;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zk.ui.util.Clients;
 import org.zkoss.zul.Image;
 
 /**
@@ -274,6 +275,7 @@ public class ChangePasswordPanel extends Window implements EventListener<Event>
     
     public void validateChangePassword()
     {
+    	Clients.clearBusy();
     	String oldPassword = txtOldPassword.getValue();
     	String newPassword = txtNewPassword.getValue();
     	String retypeNewPassword = txtRetypeNewPassword.getValue();
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 f0c8270586..261df9bf72 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
@@ -153,14 +153,20 @@ public class LoginWindow extends FWindow implements EventListener<Event>
            if (rolePanel != null)
            {
                rolePanel.validateRoles();
+               return;
            }
-           else 
+           
+           LoginPanel loginPanel = (LoginPanel)this.getFellowIfAny("loginPanel");
+           if (loginPanel != null)
            {
-	           LoginPanel loginPanel = (LoginPanel)this.getFellowIfAny("loginPanel");
-	           if (loginPanel != null)
-	           {
-	               loginPanel.validateLogin();
-	           }
+               loginPanel.validateLogin();
+               return;
+           }
+           
+           ChangePasswordPanel changePasswordPanel = (ChangePasswordPanel)this.getFellowIfAny("changePasswordPanel");
+           if (changePasswordPanel != null){
+        	   changePasswordPanel.validateChangePassword();
+        	   return;
            }
        }
     }