diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
index 30749a4e8a..256fa18280 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
@@ -589,7 +589,7 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
     	int AD_Role_ID = Env.getAD_Role_ID(ctx);
     	lstRole.setValue(AD_Role_ID);
     	updateOrganisationList();
-    	int AD_Org_ID = Env.getAD_Org_ID(ctx);
+    	int AD_Org_ID = Env.getContextAsInt(ctx, "#AD_Org_ID_ChangeRole");
     	lstOrganisation.setValue(AD_Org_ID);
     	updateWarehouseList();
     	int M_Warehouse_ID = Env.getContextAsInt(ctx, Env.M_WAREHOUSE_ID);
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 22fb5cb2f6..477fc8bb90 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
@@ -213,6 +213,7 @@ public class LoginWindow extends FWindow implements EventListener<Event>
     {
     	Env.setCtx(ctx);
     	// clear the org ID - to force a logout if the user pushes Refresh on RolePanel
+		Env.setContext(ctx, "#AD_Org_ID_ChangeRole", Env.getAD_Org_ID(ctx));
 		Env.setContext(ctx, Env.AD_ORG_ID, "");
     	getDesktop().getSession().setAttribute(SessionContextListener.SESSION_CTX, ctx);