diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php
index 22f0e1e1a..c21b00811 100644
--- a/modules/admin/admin.admin.controller.php
+++ b/modules/admin/admin.admin.controller.php
@@ -1087,6 +1087,7 @@ class adminAdminController extends admin
 			$args = new stdClass();
 			$args->domain_srl = $domain_info->domain_srl;
 			$args->domain = $vars->domain;
+			$args->is_default_domain = 'N';
 			$args->index_module_srl = $vars->index_module_srl;
 			$args->index_document_srl = $vars->index_document_srl;
 			$args->http_port = $vars->http_port;
@@ -1115,7 +1116,7 @@ class adminAdminController extends admin
 		}
 		
 		// Update system configuration to match the default domain.
-		if ($domain_info && $domain_srl === '0')
+		if ($domain_info && $domain_info->is_default_domain === 'Y')
 		{
 			$domain_info->domain = $vars->domain;
 			$domain_info->http_port = $vars->http_port;
diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index 877931fd9..c2a2fb65c 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -557,6 +557,7 @@ class adminAdminView extends admin
 		// Other settings
 		Context::set('use_rewrite', Rhymix\Framework\Config::get('use_rewrite'));
 		Context::set('use_sso', Rhymix\Framework\Config::get('use_sso'));
+		Context::set('use_ssl', Rhymix\Framework\Config::get('url.ssl'));
 		Context::set('delay_session', Rhymix\Framework\Config::get('session.delay'));
 		Context::set('use_session_keys', Rhymix\Framework\Config::get('session.use_keys'));
 		Context::set('use_session_ssl', Rhymix\Framework\Config::get('session.use_ssl'));
@@ -705,7 +706,7 @@ class adminAdminView extends admin
 		}
 		else
 		{
-			$index_module_srl = 0;
+			$index_module_srl = '';
 		}
 		Context::set('module_list', $module_list);
 		Context::set('index_module_srl', $index_module_srl);