diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 92f2a8e3836..5767aee6b48 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -439,22 +439,6 @@ class Conf
 		if (isset($this->contrat))   $this->contract=$this->contrat;
 		if (isset($this->categorie)) $this->category=$this->categorie;
 
-
-        // Define menu manager in setup
-        if (empty($user->societe_id))    // If internal user or not defined
-        {
-            $this->top_menu=(empty($this->global->MAIN_MENU_STANDARD_FORCED)?$this->global->MAIN_MENU_STANDARD:$this->global->MAIN_MENU_STANDARD_FORCED);
-            $this->smart_menu=(empty($this->global->MAIN_MENU_SMARTPHONE_FORCED)?$this->global->MAIN_MENU_SMARTPHONE:$this->global->MAIN_MENU_SMARTPHONE_FORCED);
-        }
-        else                        // If external user
-        {
-            $this->top_menu=(empty($this->global->MAIN_MENUFRONT_STANDARD_FORCED)?$this->global->MAIN_MENUFRONT_STANDARD:$this->global->MAIN_MENUFRONT_STANDARD_FORCED);
-            $this->smart_menu=(empty($this->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?$this->global->MAIN_MENUFRONT_SMARTPHONE:$this->global->MAIN_MENUFRONT_SMARTPHONE_FORCED);
-        }
-        // For backward compatibility
-        if ($this->top_menu == 'eldy.php') $this->top_menu='eldy_backoffice.php';
-        elseif ($this->top_menu == 'rodolphe.php') $this->top_menu='eldy_backoffice.php';
-
         // Object $mc
         if (! defined('NOREQUIREMC') && ! empty($this->multicompany->enabled))
         {
diff --git a/htdocs/core/menus/standard/auguria_backoffice.php b/htdocs/core/menus/standard/auguria_backoffice.php
index 99f76275c3f..cbae14ce2cd 100644
--- a/htdocs/core/menus/standard/auguria_backoffice.php
+++ b/htdocs/core/menus/standard/auguria_backoffice.php
@@ -29,15 +29,13 @@
 
 
 /**
- *	\class      MenuTop
- *	\brief      Classe permettant la gestion du menu du haut Auguria
+ *	Classe permettant la gestion du menu du haut Auguria
  */
-
 class MenuTop
 {
 	var $db;
 	var $require_left=array("auguria_backoffice");  // Si doit etre en phase avec un gestionnaire de menu gauche particulier
-	var $hideifnotallowed=0;						// Put 0 for back office menu, 1 for front office menu
+	var $type_user=0;								// Put 0 for internal users, 1 for external users
 	var $atarget="";                                // Valeur du target a utiliser dans les liens
 
 
@@ -61,7 +59,7 @@ class MenuTop
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php';
 
-		print_auguria_menu($this->db,$this->atarget,$this->hideifnotallowed);
+		print_auguria_menu($this->db,$this->atarget,$this->type_user);
 	}
 
 }
diff --git a/htdocs/core/menus/standard/auguria_frontoffice.php b/htdocs/core/menus/standard/auguria_frontoffice.php
index 4446cbe483d..a59404b4428 100644
--- a/htdocs/core/menus/standard/auguria_frontoffice.php
+++ b/htdocs/core/menus/standard/auguria_frontoffice.php
@@ -35,7 +35,7 @@ class MenuTop
 {
 	var $db;
 	var $require_left=array("auguria_backoffice");	// Si doit etre en phase avec un gestionnaire de menu gauche particulier
-	var $hideifnotallowed=1;						// Put 0 for back office menu, 1 for front office menu
+	var $type_user=1;								// Put 0 for internal users, 1 for external users
 	var $atarget="";                                // Valeur du target a utiliser dans les liens
 
 
@@ -60,7 +60,7 @@ class MenuTop
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php';
 
-		print_auguria_menu($this->db,$this->atarget,$this->hideifnotallowed);
+		print_auguria_menu($this->db,$this->atarget,$this->type_user);
 	}
 
 }
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 0c846a4092e..4ef4ede7015 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -29,7 +29,7 @@
  *
  * @param 	DoliDB	$db				Database handler
  * @param 	string	$atarget		Target
- * @param 	int		$type_user     	0=Internal,1=External,2=All
+ * @param 	int		$type_user     	0=Menu for backoffice, 1=Menu for front office
  * @return	void
  */
 function print_eldy_menu($db,$atarget,$type_user)
diff --git a/htdocs/core/menus/standard/eldy_backoffice.php b/htdocs/core/menus/standard/eldy_backoffice.php
index cba3c2fbf2f..b38265e7b12 100644
--- a/htdocs/core/menus/standard/eldy_backoffice.php
+++ b/htdocs/core/menus/standard/eldy_backoffice.php
@@ -28,14 +28,13 @@
 
 
 /**
- *      \class      MenuTop
- *	    \brief      Class to manage top menu Eldy (for internal users)
+ *	Class to manage top menu Eldy (for internal users)
  */
 class MenuTop
 {
 	var $db;
 	var $require_left=array("eldy_backoffice");     // Si doit etre en phase avec un gestionnaire de menu gauche particulier
-	var $hideifnotallowed=0;						// Put 0 for back office menu, 1 for front office menu
+	var $type_user=0;								// Put 0 for internal users, 1 for external users
 	var $atarget="";                                // Valeur du target a utiliser dans les liens
 
 
@@ -59,7 +58,7 @@ class MenuTop
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php';
 
-		print_eldy_menu($this->db,$this->atarget,$this->hideifnotallowed);
+		print_eldy_menu($this->db,$this->atarget,$this->type_user);
 	}
 
 }
diff --git a/htdocs/core/menus/standard/eldy_frontoffice.php b/htdocs/core/menus/standard/eldy_frontoffice.php
index b6ae55fad70..9ee98e5a296 100644
--- a/htdocs/core/menus/standard/eldy_frontoffice.php
+++ b/htdocs/core/menus/standard/eldy_frontoffice.php
@@ -34,7 +34,7 @@ class MenuTop
 {
 	var $db;
 	var $require_left=array("eldy_frontoffice");    // Si doit etre en phase avec un gestionnaire de menu gauche particulier
-	var $hideifnotallowed=1;						// Put 0 for back office menu, 1 for front office menu
+	var $type_user=1;								// Put 0 for internal users, 1 for external users
 	var $atarget="";                                // Valeur du target a utiliser dans les liens
 
 
@@ -58,7 +58,7 @@ class MenuTop
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/eldy.lib.php';
 
-		print_eldy_menu($this->db,$this->atarget,$this->hideifnotallowed);
+		print_eldy_menu($this->db,$this->atarget,$this->type_user);
 	}
 
 }
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 9382f6bb333..f67ded5b41f 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -28,7 +28,7 @@ class MenuTop
 {
 	var $db;
     var $require_left=array("empty");   // If this top menu handler must be used with a particular left menu handler
-    var $hideifnotallowed=false;		// Put 0 for back office menu, 1 for front office menu
+	var $type_user=0;					// Put 0 for internal users, 1 for external users
     var $atarget="";               		// To store arget to use in menu links
 
 
@@ -50,7 +50,7 @@ class MenuTop
      */
     function showmenu()
     {
-        global $user,$conf,$langs,$dolibarr_main_db_name;;
+        global $user,$conf,$langs,$dolibarr_main_db_name;
 
         print_start_menu_array_empty();
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 0daf63ff750..ff5c7299ee1 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1149,8 +1149,22 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 
     $toprightmenu='';
 
+	// Define menu manager in setup
+	if (empty($user->societe_id))    // If internal user or not defined
+	{
+		$conf->top_menu=(empty($conf->global->MAIN_MENU_STANDARD_FORCED)?$conf->global->MAIN_MENU_STANDARD:$conf->global->MAIN_MENU_STANDARD_FORCED);
+		$conf->smart_menu=(empty($conf->global->MAIN_MENU_SMARTPHONE_FORCED)?$conf->global->MAIN_MENU_SMARTPHONE:$conf->global->MAIN_MENU_SMARTPHONE_FORCED);
+	}
+	else                        // If external user
+	{
+		$conf->top_menu=(empty($conf->global->MAIN_MENUFRONT_STANDARD_FORCED)?$conf->global->MAIN_MENUFRONT_STANDARD:$conf->global->MAIN_MENUFRONT_STANDARD_FORCED);
+		$conf->smart_menu=(empty($conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED)?$conf->global->MAIN_MENUFRONT_SMARTPHONE:$conf->global->MAIN_MENUFRONT_SMARTPHONE_FORCED);
+	}
+	// For backward compatibility
+	if ($conf->top_menu == 'eldy.php') $conf->top_menu='eldy_backoffice.php';
+	elseif ($conf->top_menu == 'rodolphe.php') $conf->top_menu='eldy_backoffice.php';
     if (! $conf->top_menu)  $conf->top_menu ='eldy_backoffice.php';
-
+    
     // For backward compatibility with old modules
     if (empty($conf->headerdone)) top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);