diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Button.java b/zkwebui/WEB-INF/src/org/adempiere/webui/component/Button.java
index 9c6dfccc41..be033f9eed 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/component/Button.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/component/Button.java
@@ -17,7 +17,6 @@
 
 package org.adempiere.webui.component;
 
-import org.adempiere.webui.apps.form.WCreateFrom;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
index fc5437864c..3c661725ef 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/LoginPanel.java
@@ -175,7 +175,7 @@ public class LoginPanel extends Window implements EventListener
         {
             validateLogin();
         }
-        if (event.getName().equals("onSelect"))
+        if (event.getName().equals(Events.ON_SELECT))
         {
             if(eventComp.getId().equals(lstLanguage.getId())) {
             	String langName = (String) lstLanguage.getSelectedItem().getValue();