diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php
index ada34ad52fc..2862914d061 100644
--- a/htdocs/core/conf.class.php
+++ b/htdocs/core/conf.class.php
@@ -166,7 +166,7 @@ class Conf
 
 		$rootfordata = DOL_DATA_ROOT;
 		// If multicompany module is enabled, we redefine the root of data
-		if (! empty($this->global->MAIN_MODULE_MULTICOMPANY) && ! empty($this->entity)) $rootfordata.='/'.$this->entity;
+		if (! empty($this->global->MAIN_MODULE_MULTICOMPANY) && ! empty($this->entity) && $this->entity > 1) $rootfordata.='/'.$this->entity;
 
 		// For backward compatibility
 		// TODO Remove params this->xxx->enabled. Must be replaced by conf->global->MAIN_MODULE_XXX
diff --git a/htdocs/includes/modules/modSyslog.class.php b/htdocs/includes/modules/modSyslog.class.php
index 062cc3ed05b..e82539c7110 100644
--- a/htdocs/includes/modules/modSyslog.class.php
+++ b/htdocs/includes/modules/modSyslog.class.php
@@ -58,6 +58,11 @@ class modSyslog extends DolibarrModules
 
 		// Data directories to create when module is enabled
 		$this->dirs = array();
+		$r=0;
+		
+		$this->dirs[$r][0] = "output";
+		$this->dirs[$r][1] = "/logs";
+		$this->dirs[$r][2] = 1;
 
 		// Config pages
 		$this->config_page_url = array("syslog.php");