diff --git a/CoreVersions/0.2.0/Frameworks/Baikal/Model/Config/Standard.php b/CoreVersions/0.2.0/Frameworks/Baikal/Model/Config/Standard.php
index f1058ff..d9165ab 100755
--- a/CoreVersions/0.2.0/Frameworks/Baikal/Model/Config/Standard.php
+++ b/CoreVersions/0.2.0/Frameworks/Baikal/Model/Config/Standard.php
@@ -35,6 +35,9 @@ class Standard extends \Baikal\Model\Config {
 		"BAIKAL_ADMIN_ENABLED" => array(
 			"type" => "boolean",
 		),
+		"BAIKAL_ADMIN_AUTOLOCKENABLED" => array(
+			"type" => "boolean",
+		),
 		"BAIKAL_CAL_ENABLED" => array(
 			"type" => "boolean",
 		),
@@ -54,6 +57,7 @@ class Standard extends \Baikal\Model\Config {
 		"BAIKAL_CARD_ENABLED" => "",
 		"BAIKAL_CAL_ENABLED" => "",
 		"BAIKAL_ADMIN_ENABLED" => "",
+		"BAIKAL_ADMIN_AUTOLOCKENABLED" => "",
 		"BAIKAL_ADMIN_PASSWORDHASH" => ""
 	);
 	
@@ -77,6 +81,15 @@ class Standard extends \Baikal\Model\Config {
 			),
 		)));
 		
+		$oMorpho->add(new \Formal\Element\Checkbox(array(
+			"prop" => "BAIKAL_ADMIN_AUTOLOCKENABLED",
+			"label" => "Enable Web Admin autolock",
+			"popover" => array(
+				"title" => "Web admin autolock",
+				"content" => "If enabled, you'll have to create a file named ENABLE_ADMIN in Specific/ prior to every admin use."
+			)
+		)));
+		
 		$oMorpho->add(new \Formal\Element\Checkbox(array(
 			"prop" => "BAIKAL_CAL_ENABLED",
 			"label" => "Enable CalDAV"
diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Install/Initialize.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Install/Initialize.php
index 438b9d6..3131b4e 100755
--- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Install/Initialize.php
+++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Install/Initialize.php
@@ -142,6 +142,9 @@ define("BAIKAL_CAL_ENABLED", TRUE);
 # Baïkal Web Admin ON/OFF switch; default TRUE
 define("BAIKAL_ADMIN_ENABLED", TRUE);
 
+# Baïkal Web Admin autolock ON/OFF switch; default TRUE
+define("BAIKAL_ADMIN_AUTOLOCKENABLED", TRUE);
+
 # Baïkal Web admin password hash; Set by Core/Scripts/adminpassword.php or via Baïkal Web Admin
 define("BAIKAL_ADMIN_PASSWORDHASH", "");
 CODE;
diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Core/Auth.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Core/Auth.php
index 4a6f10b..d7af35b 100755
--- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Core/Auth.php
+++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Core/Auth.php
@@ -37,6 +37,10 @@ class Auth {
 	
 	public static function assertUnlocked() {
 		
+		if(defined("BAIKAL_ADMIN_AUTOLOCKENABLED") && BAIKAL_ADMIN_AUTOLOCKENABLED === FALSE) {
+			return TRUE;
+		}
+		
 		if(defined("BAIKAL_CONTEXT_INSTALL") && BAIKAL_CONTEXT_INSTALL === TRUE) {
 			$sToolName = "Baïkal Install Tool";
 		} else {
diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Framework.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Framework.php
index 2379bb1..419ddb5 100755
--- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Framework.php
+++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/Framework.php
@@ -29,7 +29,7 @@ namespace BaikalAdmin;
 class Framework extends \Flake\Core\Framework {
 	
 	public static function bootstrap() {
-		define("BAIKALADMIN_PATH_ROOT", dirname(__FILE__) . "/");	# ./
+		define("BAIKALADMIN_PATH_ROOT", PROJECT_PATH_ROOT . "Core/Frameworks/BaikalAdmin/");	# ./
 		
 		\Baikal\Framework::bootstrap();
 		\Formal\Framework::bootstrap();
diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/index.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/index.php
index a552947..236e268 100755
--- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/index.php
+++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/index.php
@@ -26,13 +26,14 @@
 
 ini_set("display_errors", 1);
 error_reporting(E_ALL);
-define("PROJECT_CONTEXT_BASEURI", "/admin/");
 
 define("BAIKAL_CONTEXT", TRUE);
 define("BAIKAL_CONTEXT_ADMIN", TRUE);
+define("PROJECT_CONTEXT_BASEURI", "/admin/");
+define("PROJECT_PATH_ROOT", dirname(dirname(getcwd())) . "/");	#../../
 
 # Bootstraping Flake
-require_once(dirname(dirname(dirname(__FILE__))) . "/Flake/Framework.php");	# ../../
+require_once(PROJECT_PATH_ROOT . "Core/Frameworks/Flake/Framework.php");	# ../../
 \Flake\Framework::bootstrap();
 
 # Bootstrap BaikalAdmin
diff --git a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/install/index.php b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/install/index.php
index 97d169d..743921d 100755
--- a/CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/install/index.php
+++ b/CoreVersions/0.2.0/Frameworks/BaikalAdmin/WWWRoot/install/index.php
@@ -26,13 +26,15 @@
 
 ini_set("display_errors", 1);
 error_reporting(E_ALL);
-define("PROJECT_CONTEXT_BASEURI", "/admin/install/");
 
 define("BAIKAL_CONTEXT", TRUE);
 define("BAIKAL_CONTEXT_INSTALL", TRUE);
 
+define("PROJECT_CONTEXT_BASEURI", "/admin/install/");
+define("PROJECT_PATH_ROOT", dirname(dirname(dirname(getcwd()))) . "/");	# ../../../
+
 # Bootstraping Flake
-require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/Flake/Framework.php");	# ../../../
+require_once(PROJECT_PATH_ROOT . "Core/Frameworks/Flake/Framework.php");
 \Flake\Framework::bootstrap();
 
 # Bootstrap BaikalAdmin
@@ -61,8 +63,5 @@ if(!defined("BAIKAL_CONFIGURED_VERSION")) {
 	$oPage->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Install\VersionUpgrade());
 }
 
-# Route the request
-//$GLOBALS["ROUTER"]::route($oPage);
-
 # Render the page
 echo $oPage->render();
\ No newline at end of file
diff --git a/CoreVersions/0.2.0/Frameworks/Flake/Framework.php b/CoreVersions/0.2.0/Frameworks/Flake/Framework.php
index 2dc1585..87a2d34 100755
--- a/CoreVersions/0.2.0/Frameworks/Flake/Framework.php
+++ b/CoreVersions/0.2.0/Frameworks/Flake/Framework.php
@@ -25,7 +25,7 @@
 ***************************************************************/
 
 namespace Flake;
-require_once(dirname(__FILE__) . "/Core/Framework.php");	# Manual require as Classloader not included yet
+require_once(PROJECT_PATH_ROOT . "Core/Frameworks/Flake/Core/Framework.php");	# Manual require as Classloader not included yet
 
 	
 if(!function_exists("debug")) {
@@ -75,7 +75,7 @@ class Framework extends \Flake\Core\Framework {
 		}
 
 		# Define absolute server path to Flake Framework
-		define("FLAKE_PATH_ROOT", dirname(__FILE__) . "/");	# ./
+		define("FLAKE_PATH_ROOT", PROJECT_PATH_ROOT . "Core/Frameworks/Flake/");	# ./
 
 		if(!defined('LF')) {
 			define('LF', chr(10));
@@ -100,7 +100,6 @@ class Framework extends \Flake\Core\Framework {
 		# determine Flake install root path
 		# not using realpath here to avoid symlinks resolution
 
-		define("PROJECT_PATH_ROOT", dirname(dirname(dirname(dirname(dirname(__FILE__))))) . "/");	# ../../../../../
 		define("PROJECT_PATH_CORE", PROJECT_PATH_ROOT . "Core/");
 		define("PROJECT_PATH_SPECIFIC", PROJECT_PATH_ROOT . "Specific/");
 		define("PROJECT_PATH_FRAMEWORKS", PROJECT_PATH_CORE . "Frameworks/");
diff --git a/CoreVersions/0.2.0/Frameworks/Formal/Framework.php b/CoreVersions/0.2.0/Frameworks/Formal/Framework.php
index ce34fd4..ad62d44 100755
--- a/CoreVersions/0.2.0/Frameworks/Formal/Framework.php
+++ b/CoreVersions/0.2.0/Frameworks/Formal/Framework.php
@@ -29,9 +29,9 @@ namespace Formal;
 class Framework extends \Flake\Core\Framework {
 	
 	public static function bootstrap() {
-		define("FORMAL_PATH_ROOT", dirname(__FILE__) . "/");
+		define("FORMAL_PATH_ROOT", PROJECT_PATH_ROOT . "Core/Frameworks/Formal/");
 		
-		require_once(dirname(__FILE__) . '/Core/ClassLoader.php');
+		require_once(FORMAL_PATH_ROOT . 'Core/ClassLoader.php');
 		\Formal\Core\ClassLoader::register();		
 	}
 }
\ No newline at end of file
diff --git a/CoreVersions/0.2.0/WWWRoot/cal.php b/CoreVersions/0.2.0/WWWRoot/cal.php
index 2fe8cec..ccc7018 100755
--- a/CoreVersions/0.2.0/WWWRoot/cal.php
+++ b/CoreVersions/0.2.0/WWWRoot/cal.php
@@ -26,9 +26,10 @@
 
 define("BAIKAL_CONTEXT", TRUE);
 define("PROJECT_CONTEXT_BASEURI", "/");
+define("PROJECT_PATH_ROOT", dirname(getcwd()) . "/");	#../
 
 # Bootstraping Flake
-require_once(dirname(dirname(__FILE__)) . "/Frameworks/Flake/Framework.php");
+require_once(PROJECT_PATH_ROOT . "Core/Frameworks/Flake/Framework.php");
 \Flake\Framework::bootstrap();
 
 # Bootstrapping Baïkal
diff --git a/CoreVersions/0.2.0/WWWRoot/card.php b/CoreVersions/0.2.0/WWWRoot/card.php
index c3631d7..9865ee7 100755
--- a/CoreVersions/0.2.0/WWWRoot/card.php
+++ b/CoreVersions/0.2.0/WWWRoot/card.php
@@ -26,9 +26,10 @@
 
 define("BAIKAL_CONTEXT", TRUE);
 define("PROJECT_CONTEXT_BASEURI", "/");
+define("PROJECT_PATH_ROOT", dirname(getcwd()) . "/");	#../
 
 # Bootstraping Flake
-require_once(dirname(dirname(__FILE__)) . "/Frameworks/Flake/Framework.php");
+require_once(PROJECT_PATH_ROOT . "Core/Frameworks/Flake/Framework.php");
 \Flake\Framework::bootstrap();
 
 # Bootstrapping Baïkal
diff --git a/CoreVersions/0.2.0/WWWRoot/index.php b/CoreVersions/0.2.0/WWWRoot/index.php
index 62ba432..607fb2a 100755
--- a/CoreVersions/0.2.0/WWWRoot/index.php
+++ b/CoreVersions/0.2.0/WWWRoot/index.php
@@ -25,9 +25,10 @@
 ***************************************************************/
 define("BAIKAL_CONTEXT", TRUE);
 define("PROJECT_CONTEXT_BASEURI", "/");
+define("PROJECT_PATH_ROOT", dirname(getcwd()) . "/");	#../
 
 # Bootstraping Flake
-require_once(dirname(dirname(__FILE__)) . "/Frameworks/Flake/Framework.php");
+require_once(PROJECT_PATH_ROOT . "Core/Frameworks/Flake/Framework.php");
 \Flake\Framework::bootstrap();
 
 # Bootstrapping Baïkal