diff --git a/org.adempiere.ui.zk/index.zul b/org.adempiere.ui.zk/index.zul
index 5aa8ed4320..e45f08f2d3 100644
--- a/org.adempiere.ui.zk/index.zul
+++ b/org.adempiere.ui.zk/index.zul
@@ -145,7 +145,8 @@ Copyright (C) 2007 Ashley G Ramdass.
 					
 				this.$bind_(dt, skipper, after);
 				
-				if (this.getType () != "password"){
+				var txtid = this.getId()
+				if (txtid != "txtUserId" && txtid != "txtPassword" ){
 					return;
 				}
 				
@@ -159,7 +160,8 @@ Copyright (C) 2007 Ashley G Ramdass.
 				
 				this.$unbind_(dt, skipper);
 				
-				if (this.getType () != "password"){
+				var txtid = this.getId()
+				if (txtid != "txtUserId" && txtid != "txtPassword" ){
 					return;
 				}