diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java b/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java
index 7156d83960..6e18b6e81e 100644
--- a/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java
+++ b/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java
@@ -197,7 +197,7 @@ public final class AMenu extends CFrame
 		infoUpdaterThread.start();
 
         // Auto Expand Tree - nmicoud IDEMPIERE 195
-        if (MRole.getDefault().isMenuAutoExpand() || new MUser(m_ctx, m_AD_User_ID, null).isMenuAutoExpand())
+        if (MRole.getDefault().isMenuAutoExpand() || MUser.get(m_ctx).isMenuAutoExpand())
                 treePanel.expandTree(true);
         // Auto Expand Tree - nmicoud IDEMPIERE 195
 
diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreePanel.java b/org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreePanel.java
index 0b7f09e9ec..5f07552b21 100644
--- a/org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreePanel.java
+++ b/org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreePanel.java
@@ -173,7 +173,7 @@ public final class VTreePanel extends CPanel
 	/**
 	 *
 	 */
-	private static final long serialVersionUID = -6798614427038652192L;
+	private static final long serialVersionUID = -7188402231414573844L;
 
 	private static final String PREFIX_DOCUMENT_SEARCH = "/";
 
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuPanel.java
index bc8f5fc8c6..a5602c0c22 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/MenuPanel.java
@@ -84,7 +84,7 @@ public class MenuPanel extends Panel implements EventListener
         pnlSearch.initialise();
 
         // Auto Expand Tree - nmicoud IDEMPIERE 195
-     	if (MRole.getDefault().isMenuAutoExpand() || new MUser(ctx, Env.getAD_User_ID(ctx), null).isMenuAutoExpand())
+     	if (MRole.getDefault().isMenuAutoExpand() || MUser.get(ctx).isMenuAutoExpand())
      		expandAll();
      	// Auto Expand Tree - nmicoud IDEMPIERE 195
     }