diff --git a/boot.php b/boot.php
index 0dee716e7..7a959a09a 100644
--- a/boot.php
+++ b/boot.php
@@ -616,6 +616,10 @@ if(! class_exists('App')) {
 			return($basepath);
 		}
 
+		function get_scheme() {
+			return($this->scheme);
+		}
+
 		function get_baseurl($ssl = false) {
 
 			$scheme = $this->scheme;
diff --git a/index.php b/index.php
index d628f9ad2..45d159969 100644
--- a/index.php
+++ b/index.php
@@ -53,6 +53,13 @@ if(!$install) {
 	load_config('config');
 	load_config('system');
 
+	if ((intval(get_config('system','ssl_policy')) == SSL_POLICY_FULL) AND
+		($a->get_scheme() == "http") AND
+		(substr($a->get_baseurl(), 0, 8) == "https://")) {
+		header("HTTP/1.1 302 Moved Temporarily");
+		header("location: ".$a->get_baseurl()."/".$a->query_string);
+	}
+
 	require_once("include/session.php");
 	load_hooks();
 	call_hooks('init_1');