diff --git a/htdocs/ajaxbox.php b/htdocs/ajaxbox.php
index e0a653533c4..64ee33a00e8 100644
--- a/htdocs/ajaxbox.php
+++ b/htdocs/ajaxbox.php
@@ -34,7 +34,7 @@ if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
 
 // Retrieve the entity in the cookie
-$entityCookieName = "DOLENTITYID_dolibarr";
+$entityCookieName = "DOLENTITYID_".md5($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"]);
 if (isset($_COOKIE[$entityCookieName])) $_SESSION["dol_entity"] = $_COOKIE[$entityCookieName];
 
 require('master.inc.php');
diff --git a/htdocs/includes/modules/modMultiCompany.class.php b/htdocs/includes/modules/modMultiCompany.class.php
index c7bc78c044d..53eb5d62ead 100644
--- a/htdocs/includes/modules/modMultiCompany.class.php
+++ b/htdocs/includes/modules/modMultiCompany.class.php
@@ -91,7 +91,7 @@ class modMultiCompany extends DolibarrModules
 		//                            1=>array('MODULE_MY_NEW_CONST2','chaine','myvalue','This is another constant to add',0) );
 
 		$this->const=array(1=>array('MAIN_MODULE_MULTICOMPANY_NEEDSMARTY',"chaine",1,'Need smarty',0,0));
-		
+
 		// Array to add new pages in new tabs
 		//$this->tabs = array('entity:Title:@mymodule:/mymodule/mynewtab.php?id=__ID__');
 		// where entity can be
@@ -204,7 +204,7 @@ class modMultiCompany extends DolibarrModules
 	function init()
 	{
 		$sql = array();
-		
+
 		return $this->_init($sql);
 	}
 
@@ -230,7 +230,7 @@ class modMultiCompany extends DolibarrModules
 	function destroy_cookie()
 	{
 		// Destroy entity cookie
-		$entityCookieName = "DOLENTITYID_dolibarr";
+		$entityCookieName = "DOLENTITYID_".md5($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"]);
 		setcookie($entityCookieName, '', 1, "/");
 	}
 }