diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 915cde1a475..f5f8d5e3332 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -59,31 +59,14 @@ else
 //error_reporting(E_ALL);
 error_reporting(E_ALL ^ E_NOTICE);
 
-// Test si install ok
-/*
-if (! isset($dolibarr_main_db_host))
+
+// Include configuration
+if (! @include_once("conf/conf.php") || empty($dolibarr_main_db_host))
 {
     print 'Error: Dolibarr setup was run but was not completed.<br>'."\n";
 	print 'Please, run <a href="install/index.php">Dolibarr install process</a> until the end...'."\n";
     exit;
 }
-*/
-
-// Régression temporaire
-if (! @include_once("conf/conf.php"))		// FIXME: Ce test est inutile car si le test renvoi vrai le suivant aussi. Seul le suivant est utile.
-{
-	Header("Location: install/index.php"); 	 
-	exit; 	 
-} 	 
-else
-{
-	if (! isset($dolibarr_main_db_host))
-	{
-		Header("Location: install/index.php");
-		exit;
-	}
-}
-//Fin régression
 
 if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type='mysql';   // Pour compatibilite avec anciennes configs, si non defini, on prend 'mysql'
 if (empty($dolibarr_main_data_root))