diff --git a/launcher.sh b/launcher.sh
index a683f7e..f46ecd6 100755
--- a/launcher.sh
+++ b/launcher.sh
@@ -19,6 +19,7 @@ CONFIG_DIR="$BASE_DIR/config"
 # Load core libraries
 source "$LIB_DIR/common-functions.sh"
 source "$LIB_DIR/system-detect.sh"
+source "$LIB_DIR/domain-discovery.sh"
 source "$LIB_DIR/user-manager.sh"
 source "$LIB_DIR/reference-db.sh"
 
diff --git a/lib/system-detect.sh b/lib/system-detect.sh
index 310362e..0fb82cb 100755
--- a/lib/system-detect.sh
+++ b/lib/system-detect.sh
@@ -23,13 +23,13 @@ if [ -z "$SYS_DETECTION_COMPLETE" ]; then
     export SYS_DB_TYPE=""
     export SYS_DB_VERSION=""
     export SYS_LOG_DIR=""
+    export SYS_USER_HOME_BASE=""
+    export SYS_PHP_VERSIONS=()
+    export SYS_CLOUDFLARE_ACTIVE=""
+    export SYS_FIREWALL=""
+    export SYS_FIREWALL_VERSION=""
+    export SYS_FIREWALL_ACTIVE=""
 fi
-export SYS_USER_HOME_BASE=""
-export SYS_PHP_VERSIONS=()
-export SYS_CLOUDFLARE_ACTIVE=""
-export SYS_FIREWALL=""
-export SYS_FIREWALL_VERSION=""
-export SYS_FIREWALL_ACTIVE=""
 
 #############################################################################
 # CONTROL PANEL DETECTION