diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 1a40de3c713..d3be68503c0 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -252,92 +252,92 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM
 	// Show menu
 	if (empty($noout))
 	{
-	$alt=0;
-	$num=count($menu_array);
-	for ($i = 0; $i < $num; $i++)
-	{
-		$showmenu=true;
-		if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) 	$showmenu=false;
-
-		$alt++;
-		if (empty($menu_array[$i]['level']) && $showmenu)
+		$alt=0;
+		$num=count($menu_array);
+		for ($i = 0; $i < $num; $i++)
 		{
-			if (($alt%2==0))
+			$showmenu=true;
+			if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) 	$showmenu=false;
+
+			$alt++;
+			if (empty($menu_array[$i]['level']) && $showmenu)
 			{
-				print '<div class="blockvmenuimpair">'."\n";
+				if (($alt%2==0))
+				{
+					print '<div class="blockvmenuimpair">'."\n";
+				}
+				else
+				{
+					print '<div class="blockvmenupair">'."\n";
+				}
 			}
-			else
+
+			// Place tabulation
+			$tabstring='';
+			$tabul=($menu_array[$i]['level'] - 1);
+			if ($tabul > 0)
 			{
-				print '<div class="blockvmenupair">'."\n";
+				for ($j=0; $j < $tabul; $j++)
+				{
+					$tabstring.='&nbsp; &nbsp;';
+				}
+			}
+
+			// Add mainmenu in GET url. This make to go back on correct menu even when using Back on browser.
+			$url=dol_buildpath($menu_array[$i]['url'],1);
+			$url=preg_replace('/__LOGIN__/',$user->login,$url);
+			$url=preg_replace('/__USERID__/',$user->id,$url);
+
+			if (! preg_match('/mainmenu=/i',$menu_array[$i]['url']))
+			{
+				if (! preg_match('/\?/',$url)) $url.='?';
+				else $url.='&';
+				$url.='mainmenu='.$mainmenu;
+			}
+
+			print '<!-- Add menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' -->'."\n";
+
+			// Menu niveau 0
+			if ($menu_array[$i]['level'] == 0)
+			{
+				if ($menu_array[$i]['enabled'])
+				{
+					print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>'.$menu_array[$i]['titre'].'</a></div>';
+				}
+				else if ($showmenu)
+				{
+					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
+				}
+				if ($showmenu)
+					print '<div class="menu_top"></div>'."\n";
+			}
+			// Menu niveau > 0
+			if ($menu_array[$i]['level'] > 0)
+			{
+				if ($menu_array[$i]['enabled'])
+				{
+					print '<div class="menu_contenu">'.$tabstring;
+					if ($menu_array[$i]['url']) print '<a class="vsmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>';
+					print $menu_array[$i]['titre'];
+					if ($menu_array[$i]['url']) print '</a>';
+					// If title is not pure text and contains a table, no carriage return added
+					if (! strstr($menu_array[$i]['titre'],'<table')) print '<br>';
+					print '</div>'."\n";
+				}
+				else if ($showmenu)
+				{
+					print '<div class="menu_contenu">'.$tabstring.'<font class="vsmenudisabled">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
+				}
+			}
+
+			// If next is a new block or end
+			if (empty($menu_array[$i+1]['level']))
+			{
+				if ($showmenu)
+					print '<div class="menu_end"></div>'."\n";
+				print "</div>\n";
 			}
 		}
-
-		// Place tabulation
-		$tabstring='';
-		$tabul=($menu_array[$i]['level'] - 1);
-		if ($tabul > 0)
-		{
-			for ($j=0; $j < $tabul; $j++)
-			{
-				$tabstring.='&nbsp; &nbsp;';
-			}
-		}
-
-		// Add mainmenu in GET url. This make to go back on correct menu even when using Back on browser.
-		$url=dol_buildpath($menu_array[$i]['url'],1);
-		$url=preg_replace('/__LOGIN__/',$user->login,$url);
-		$url=preg_replace('/__USERID__/',$user->id,$url);
-
-		if (! preg_match('/mainmenu=/i',$menu_array[$i]['url']))
-		{
-			if (! preg_match('/\?/',$url)) $url.='?';
-			else $url.='&';
-			$url.='mainmenu='.$mainmenu;
-		}
-
-		print '<!-- Add menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' -->'."\n";
-
-		// Menu niveau 0
-		if ($menu_array[$i]['level'] == 0)
-		{
-			if ($menu_array[$i]['enabled'])
-			{
-				print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>'.$menu_array[$i]['titre'].'</a></div>';
-			}
-			else if ($showmenu)
-			{
-				print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
-			}
-			if ($showmenu)
-				print '<div class="menu_top"></div>'."\n";
-		}
-		// Menu niveau > 0
-		if ($menu_array[$i]['level'] > 0)
-		{
-			if ($menu_array[$i]['enabled'])
-			{
-				print '<div class="menu_contenu">'.$tabstring;
-				if ($menu_array[$i]['url']) print '<a class="vsmenu" href="'.$url.'"'.($menu_array[$i]['target']?' target="'.$menu_array[$i]['target'].'"':'').'>';
-				print $menu_array[$i]['titre'];
-				if ($menu_array[$i]['url']) print '</a>';
-				// If title is not pure text and contains a table, no carriage return added
-				if (! strstr($menu_array[$i]['titre'],'<table')) print '<br>';
-				print '</div>'."\n";
-			}
-			else if ($showmenu)
-			{
-				print '<div class="menu_contenu">'.$tabstring.'<font class="vsmenudisabled">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
-			}
-		}
-
-		// If next is a new block or end
-		if (empty($menu_array[$i+1]['level']))
-		{
-			if ($showmenu)
-				print '<div class="menu_end"></div>'."\n";
-			print "</div>\n";
-		}
-	}
 	}
 
 	return count($menu_array);
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 343edaf5201..35d73f55dcc 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -160,7 +160,7 @@ class MenuManager
 	 */
 	function showmenu($mode)
 	{
-    	global $conf, $langs;
+    	global $conf, $langs, $user;
 
         require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php';
 
@@ -188,6 +188,8 @@ class MenuManager
         		if ($val['enabled'] == 1)
         		{
         			$relurl=dol_buildpath($val['url'],1);
+        			$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
+        			$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
 
         			print '<a href="#">'.$val['titre'].'</a>'."\n";
         			// Search submenu fot this entry
@@ -198,6 +200,7 @@ class MenuManager
         			$res=print_left_auguria_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);
         			//var_dump($submenu->liste);
         			$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
+
         			$canonrelurl=preg_replace('/\?.*$/','',$relurl);
         			$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
         			//var_dump($canonrelurl);
@@ -211,9 +214,11 @@ class MenuManager
         			foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         			{
         				$relurl2=dol_buildpath($val2['url'],1);
+	        			$relurl2=preg_replace('/__LOGIN__/',$user->login,$relurl2);
+    	    			$relurl2=preg_replace('/__USERID__/',$user->id,$relurl2);
         				$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
         				//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
-        				if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php'))) $relurl2='';
+        				if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
         				print '<li'.($val2['level']==0?' data-role="list-divider"':'').'>';
         				if ($relurl2) print '<a href="'.$relurl2.'">';
         				print $val2['titre'];
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 18d64839fdc..d1751ead59c 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -116,7 +116,7 @@ class MenuManager
      */
     function showmenu($mode)
     {
-    	global $conf, $langs;
+    	global $conf, $langs, $user;
 
         require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php';
 
@@ -144,6 +144,8 @@ class MenuManager
         		if ($val['enabled'] == 1)
         		{
 					$relurl=dol_buildpath($val['url'],1);
+					$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
+					$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
 
         			print '<a href="#">'.$val['titre'].'</a>'."\n";
         			// Search submenu fot this entry
@@ -152,6 +154,7 @@ class MenuManager
         			$submenu=new Menu();
 	        		$res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);
         			$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
+
         			$canonrelurl=preg_replace('/\?.*$/','',$relurl);
         			$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
         			//var_dump($canonrelurl);
@@ -165,6 +168,8 @@ class MenuManager
        				foreach($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
        				{
        					$relurl2=dol_buildpath($val2['url'],1);
+	        			$relurl2=preg_replace('/__LOGIN__/',$user->login,$relurl2);
+    	    			$relurl2=preg_replace('/__USERID__/',$user->id,$relurl2);
        					//var_dump($val2);
        					print '<li'.($val2['level']==0?' data-role="list-divider"':'').'><a href="'.$relurl2.'">'.$val2['titre'].'</a></li>'."\n";
        				}
diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php
index f5523c791f2..7113d2a459a 100644
--- a/htdocs/user/logout.php
+++ b/htdocs/user/logout.php
@@ -61,8 +61,8 @@ $url=DOL_URL_ROOT."/index.php";		// By default go to login page
 if ($urlfrom) $url=DOL_URL_ROOT.$urlfrom;
 if (! empty($conf->global->MAIN_LOGOUT_GOTO_URL)) $url=$conf->global->MAIN_LOGOUT_GOTO_URL;
 
-if (! empty($_SESSION['dol_hide_topmenu']))  $url.=(preg_match('/\?/',$url)?'&':'?').'dol_hide_topmenu=1';
-if (! empty($_SESSION['dol_hide_leftmenu'])) $url.=(preg_match('/\?/',$url)?'&':'?').'dol_hide_leftmenu=1';
+if (GETPOST('dol_hide_topmenu'))  $url.=(preg_match('/\?/',$url)?'&':'?').'dol_hide_topmenu=1';
+if (GETPOST('dol_hide_leftmenu')) $url.=(preg_match('/\?/',$url)?'&':'?').'dol_hide_leftmenu=1';
 
 // Destroy session
 $prefix=dol_getprefix();