diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index ee8a5940304..70f1f3422ea 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -859,6 +859,9 @@ function write_conf_file($conffile)
 		fputs($fp, '// Specific settings');
         fputs($fp,"\n");
 
+        fputs($fp, '//$dolibarr_main_demo=\'autologin,autopass\';');
+        fputs($fp,"\n");
+
         fputs($fp, '$dolibarr_main_prod=\'0\';');
         fputs($fp,"\n");
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index c70b48aaf32..17611868829 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -325,6 +325,11 @@ if (! empty($_SESSION["disablemodules"]))
         {
         	if (empty($conf->$module)) $conf->$module=new stdClass();
         	$conf->$module->enabled=false;
+        	if ($module == 'fournisseur')		// Special case
+        	{
+        		$conf->supplier_order->enabled=0;
+        		$conf->supplier_invoice->enabled=0;
+        	}
         }
     }
 }