diff --git a/Core/Frameworks/BaikalAdmin/Controller/Install/Database.php b/Core/Frameworks/BaikalAdmin/Controller/Install/Database.php
index 5d8f429..9bd03d9 100644
--- a/Core/Frameworks/BaikalAdmin/Controller/Install/Database.php
+++ b/Core/Frameworks/BaikalAdmin/Controller/Install/Database.php
@@ -46,8 +46,7 @@ class Database extends \Flake\Core\Controller {
             $this->oForm->execute();
 
             if ($this->oForm->persisted()) {
-
-                # nothing here
+                touch(PROJECT_PATH_SPECIFIC . '/INSTALL_DISABLED');
             }
         }
     }
diff --git a/Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php b/Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php
index bd0fed9..0d264c5 100644
--- a/Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php
+++ b/Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php
@@ -71,9 +71,11 @@ if (!defined("BAIKAL_CONFIGURED_VERSION")) {
     if (BAIKAL_CONFIGURED_VERSION !== BAIKAL_VERSION) {
         # we have to upgrade Baïkal
         $oPage->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Install\VersionUpgrade());
+    } elseif (!file_exists(PROJECT_PATH_SPECIFIC . '/INSTALL_DISABLED')) {
+        $oPage->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Install\Database());
     } else {
-        die('Baïkal is already installed. Please log in to the admin interface');
-        //$oPage->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Install\Database());
+        echo "Installation was already completed. Please head to the admin interface to modify any settings.\n";
+        die();
     }
 }