diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 50c6185de01..f3e96ee2ef4 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -88,22 +88,6 @@ foreach ($_POST as $key => $val)
 set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
 
 
-// Test if install ok
-if (! @include_once("conf/conf.php"))
-{
-  Header("Location: install/index.php");
-  exit;
-}
-else
-{
-	if (! isset($dolibarr_main_db_host))
-    {
-      Header("Location: install/index.php");
-      exit;
-    }
-}
-
-
 require_once("master.inc.php");
 
 
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index f5f8d5e3332..48e7fbf8f48 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -61,13 +61,14 @@ error_reporting(E_ALL ^ E_NOTICE);
 
 
 // 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;
-}
+$result=@include_once("conf/conf.php");
 
+if (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;
+}
 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))
 {