diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index bd26c463a7f..12340a5c389 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -428,7 +428,7 @@ foreach ($orders as $key => $value)
         if (! empty($conf->global->$const_name))
         {
             // Module actif
-            if (! empty($objMod->always_enabled)) print $langs->trans("Required");
+            if (! empty($objMod->always_enabled) || (! empty($objMod->core_enabled) && ($conf->entity != 1))) print $langs->trans("Required");
             else print "<a href=\"modules.php?id=".$objMod->numero."&amp;action=reset&amp;value=" . $modName . "&amp;mode=" . $mode . "\">" . $langs->trans("Disable") . "</a></td>\n";
 
             if (! empty($objMod->config_page_url))
diff --git a/htdocs/core/menubase.class.php b/htdocs/core/menubase.class.php
index acf708ac724..81dd62a8bf4 100644
--- a/htdocs/core/menubase.class.php
+++ b/htdocs/core/menubase.class.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2007-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2009      Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/htdocs/includes/modules/modMultiCompany.class.php b/htdocs/includes/modules/modMultiCompany.class.php
index f26d04ec73f..611ca548010 100644
--- a/htdocs/includes/modules/modMultiCompany.class.php
+++ b/htdocs/includes/modules/modMultiCompany.class.php
@@ -58,6 +58,8 @@ class modMultiCompany extends DolibarrModules
 		$this->name = eregi_replace('^mod','',get_class($this));
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
 		$this->description = "Gestion Multi-Societe";
+		// Can be enabled / disabled only in the main company
+		$this->core_enabled = 1;
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'development';
 		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
diff --git a/htdocs/includes/modules/modUser.class.php b/htdocs/includes/modules/modUser.class.php
index 60b63aa7c31..b235558965c 100644
--- a/htdocs/includes/modules/modUser.class.php
+++ b/htdocs/includes/modules/modUser.class.php
@@ -39,7 +39,7 @@ class modUser extends DolibarrModules
 
 	/**
 	 *   \brief      Constructeur. Definit les noms, constantes et boites
-	 *   \param      DB      handler d'acc�s base
+	 *   \param      DB      handler d'acces base
 	 */
 	function modUser($DB)
 	{
@@ -65,7 +65,7 @@ class modUser extends DolibarrModules
 		// Config pages
 		// $this->config_page_url = array("/user/admin/index.php");
 
-		// D�pendances
+		// Dependances
 		$this->depends = array();
 		$this->requiredby = array();
 		$this->langfiles = array("main","users","companies");
@@ -155,8 +155,8 @@ class modUser extends DolibarrModules
 
 
 	/**
-	 *   \brief      Fonction appel�e lors de l'activation du module. Ins�re en base les constantes, boites, permissions du module.
-	 *               D�finit �galement les r�pertoires de donn�es � cr�er pour ce module.
+	 *   \brief      Fonction appelee lors de l'activation du module. Insere en base les constantes, boites, permissions du module.
+	 *               Definit egalement les repertoires de donnees a creer pour ce module.
 	 */
 	function init()
 	{
@@ -171,7 +171,7 @@ class modUser extends DolibarrModules
 	}
 
 	/**
-	 \brief      Fonction appel�e lors de la d�sactivation d'un module.
+	 \brief      Fonction appelee lors de la desactivation d'un module.
 	 Supprime de la base les constantes, boites et permissions du module.
 	 */
 	function remove()