diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
index 39e4ed5b03..c4b823b039 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
@@ -266,15 +266,8 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
 		//update session context
 		currSess.setAttribute(SessionContextListener.SESSION_CTX, ServerContext.getCurrentInstance());
 		
-		if ("Y".equalsIgnoreCase(Env.getContext(ctx, BrowserToken.REMEMBER_ME)) && MSystem.isZKRememberUserAllowed())
-		{
-			MUser user = MUser.get(ctx);
-			BrowserToken.save(mSession, user);
-		}
-		else
-		{
-			BrowserToken.remove();
-		}
+		MUser user = MUser.get(ctx);
+		BrowserToken.save(mSession, user);
 		
 		Env.setContext(ctx, "#UIClient", "zk");
 		StringBuilder localHttpAddr = new StringBuilder(Executions.getCurrent().getScheme());
@@ -508,7 +501,6 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
 		Env.setContext(properties, Env.AD_ROLE_ID, Env.getAD_Role_ID(Env.getCtx()));
 		Env.setContext(properties, Env.AD_ORG_NAME, Env.getContext(Env.getCtx(), Env.AD_ORG_NAME));
 		Env.setContext(properties, Env.M_WAREHOUSE_ID, Env.getContext(Env.getCtx(), Env.M_WAREHOUSE_ID));
-		Env.setContext(properties, BrowserToken.REMEMBER_ME, Env.getContext(Env.getCtx(), BrowserToken.REMEMBER_ME));
 		Env.setContext(properties, UserPreference.LANGUAGE_NAME, Env.getContext(Env.getCtx(), UserPreference.LANGUAGE_NAME));
 		Env.setContext(properties, Env.LANGUAGE, Env.getContext(Env.getCtx(), Env.LANGUAGE));
 		Env.setContext(properties, AEnv.LOCALE, Env.getContext(Env.getCtx(), AEnv.LOCALE));
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 ed8a37c440..ea7b996c42 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
@@ -164,6 +164,7 @@ public class LoginPanel extends Window implements EventListener<Event>
 							    String token = data[1];
 							    if (BrowserToken.validateToken(session, user, token))
 							    {
+							    	onUserIdChange(AD_User_ID);
 							    	if (MSystem.isZKRememberUserAllowed()) {
 							    		if (email_login) {
 							    			txtUserId.setValue(user.getEMail());
@@ -174,7 +175,6 @@ public class LoginPanel extends Window implements EventListener<Event>
 							    				txtUserId.setValue(user.getName());
 							    			}
 							    		}
-								    	onUserIdChange(AD_User_ID);
 								    	chkRememberMe.setChecked(true);
 							    	}
 							    	if (MSystem.isZKRememberPasswordAllowed()) {
@@ -567,8 +567,6 @@ public class LoginPanel extends Window implements EventListener<Event>
         	}
         }
 
-        Env.setContext(ctx, BrowserToken.REMEMBER_ME, chkRememberMe.isChecked());
-
         Session currSess = Executions.getCurrent().getDesktop().getSession();
         
         KeyNamePair clientsKNPairs[] = login.getClients(userId, userPassword);
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/BrowserToken.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/BrowserToken.java
index 0d6fe1506f..7548198105 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/BrowserToken.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/BrowserToken.java
@@ -40,7 +40,6 @@ public final class BrowserToken {
 
 	private BrowserToken() {}
 
-	public final static String REMEMBER_ME = "Login.RememberMe";
 	/**
 	 * save session and user as client side token for future auto login
 	 * @param session