diff --git a/html/setup.php b/html/setup.php
index 2ef305939a68bf8d7c69cc188497846cadcaf896..12b41b6041f6cd7824738435102b0aa0d890fe0c 100755
--- a/html/setup.php
+++ b/html/setup.php
@@ -59,7 +59,6 @@ ini_set("session.gc_maxlifetime", 24 * 60 * 60);
 session_start(); // Start or resume the session
 
 session::set('DEBUGLEVEL', 0);
-session::set('SETUP_INIT', TRUE);
 
 CSRFProtection::check();
 
diff --git a/include/class_config.inc b/include/class_config.inc
index 9f9028a032ac331a56efddfc7cb01e0e6e827a2c..7fb11c76efdcc76ed37212eeb035b9855a6d8c57 100755
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -120,8 +120,9 @@ class config
 
     // Recreate the XML parser
     $this->parser = xml_parser_create();
+
     // Update config from backend only if not currently performing FD installation.
-    if ($_SESSION['SETUP_INIT'] === FALSE) {
+    if (!isset($_SESSION['SETUP_INIT'])) {
       $this->load_inldap_config();
     }
   }
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index b6b74c276b5fb599a027842f0951b8985d285fd3..4f342c5d078553b24fd671f82d18446eaed0ccd9 100755
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -566,7 +566,7 @@ class LDAP
    */
   function clearResult ($srp)
   {
-    if ($this->hasres[$srp]) {
+    if ($this->hasres[$srp] && !is_bool($this->sr[$srp])) {
       $this->hasres[$srp] = FALSE;
       @ldap_free_result($this->sr[$srp]);
     }
diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index b650ba0e0974347f93a045a8f494a1097c62a3d1..2c0aa97ccd32d02dbdec6566598afd042557fe5b 100755
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -56,6 +56,8 @@ class setup implements FusionDirectoryDialog
       header('Location: index.php');
       exit();
     }
+
+    session::set('SETUP_INIT', TRUE);
   }
 
   public function render (): string