diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 2b1980f71..f8565f253 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -214,15 +214,15 @@ class Context
 
 		$this->loadDBInfo();
 
-		$context = Context::getInstance();
-
-		if($context->db_info->use_sitelock == 'Y') {
+		if($this->db_info->use_sitelock == 'Y')
+		{
 			$whitelist = array('127.0.0.1', '::1', 'fe80::1');
-			if(is_array($context->db_info->sitelock_whitelist)) $whitelist = array_merge($whitelist, $context->db_info->sitelock_whitelist);
+			if(is_array($this->db_info->sitelock_whitelist)) $whitelist = array_merge($whitelist, $this->db_info->sitelock_whitelist);
 
-			if(!in_array($_SERVER['REMOTE_ADDR'], $whitelist)) {
-				$title = ($context->db_info->sitelock_title) ? $context->db_info->sitelock_title : 'Maintenance in progress...';
-				$message = $context->db_info->sitelock_message;
+			if(!in_array($_SERVER['REMOTE_ADDR'], $whitelist))
+			{
+				$title = ($this->db_info->sitelock_title) ? $this->db_info->sitelock_title : 'Maintenance in progress...';
+				$message = $this->db_info->sitelock_message;
 
 				define('_XE_SITELOCK_', TRUE);
 				define('_XE_SITELOCK_TITLE_', $title);
diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php
index a55d53238..99618fd90 100644
--- a/modules/admin/admin.admin.controller.php
+++ b/modules/admin/admin.admin.controller.php
@@ -485,7 +485,6 @@ class adminAdminController extends admin
 		$vars = Context::getRequestVars();
 		$oInstallController = &getController('install');
 
-		$config_file = Context::getConfigFile();
 		$db_info = Context::getDbInfo();
 
 		$db_info->use_sitelock = ($vars->use_sitelock) ? $vars->use_sitelock : 'N';
@@ -494,13 +493,13 @@ class adminAdminController extends admin
 
 		$db_info->sitelock_whitelist = preg_replace("/[\r\n|\r|\n]+/", ",", $vars->sitelock_whitelist);
 
-		$buff = $oInstallController->_getDBConfigFileContents($db_info);
-		FileHandler::writeFile($config_file, $buff);
+		FileHandler::writeFile(Context::getConfigFile(), $oInstallController->_getDBConfigFileContents($db_info));
 
-		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+		if(!in_array(Context::getRequestMethod(), array('XMLRPC','JSON')))
 		{
-			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispAdminConfigGeneral');
-			header('location:'.$returnUrl);
+			$returnUrl = Context::get('success_return_url');
+			if(!$returnUrl) $returnUrl = getNotEncodedUrl('', 'act', 'dispAdminConfigGeneral');
+			header('location:' . $returnUrl);
 			return;
 		}
 	}