diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 96e439422..52958270b 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -261,7 +261,7 @@ class Context
 			$site_module_info = ModuleModel::getDefaultMid() ?: new stdClass;
 			self::set('site_module_info', $site_module_info);
 			self::set('_default_timezone', ($site_module_info->settings && $site_module_info->settings->timezone) ? $site_module_info->settings->timezone : null);
-			self::set('_default_url', self::$_instance->db_info->default_url = self::getDefaultUrl($site_module_info));
+			self::set('_default_url', self::$_instance->db_info->default_url = self::getDefaultUrl($site_module_info, RX_SSL));
 			self::set('_http_port', self::$_instance->db_info->http_port = $site_module_info->http_port ?: null);
 			self::set('_https_port', self::$_instance->db_info->https_port = $site_module_info->https_port ?: null);
 			self::set('_use_ssl', self::$_instance->db_info->use_ssl = ($site_module_info->security === 'none' ? 'none' : 'always'));
@@ -1824,9 +1824,9 @@ class Context
 			$site_module_info = $domain_infos[$domain] ?: $site_module_info;
 		}
 		
-		$prefix = ($use_ssl && $site_module_info->security !== 'none') ? 'https://' : 'http://';
+		$prefix = ($use_ssl || $site_module_info->security !== 'none') ? 'https://' : 'http://';
 		$hostname = $site_module_info->domain;
-		$port = ($use_ssl && $site_module_info->security !== 'none') ? $site_module_info->https_port : $site_module_info->http_port;
+		$port = ($use_ssl || $site_module_info->security !== 'none') ? $site_module_info->https_port : $site_module_info->http_port;
 		$result = $prefix . $hostname . ($port ? sprintf(':%d', $port) : '') . RX_BASEURL;
 		return $result;
 	}
diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html
index d1f4102be..7f9cf43b6 100644
--- a/common/tpl/common_layout.html
+++ b/common/tpl/common_layout.html
@@ -52,7 +52,7 @@
 	
 <!-- COMMON JS VARIABLES -->
 <script>
-	var default_url = "{\Rhymix\Framework\URL::encodeIdna(Context::getDefaultUrl())}";
+	var default_url = "{\Rhymix\Framework\URL::encodeIdna(Context::getDefaultUrl(null, RX_SSL))}";
 	var current_url = "{\Rhymix\Framework\URL::encodeIdna($current_url)}";
 	var request_uri = "{\Rhymix\Framework\URL::encodeIdna($request_uri)}";
 	var current_lang = xe.current_lang = "{$lang_type}";