diff --git a/core/domains/domains.php b/core/domains/domains.php
index 88d4b35071..8ba0e153e4 100644
--- a/core/domains/domains.php
+++ b/core/domains/domains.php
@@ -65,6 +65,7 @@
 				$_SESSION['domain_uuid'] = $domain_uuid;
 				$_SESSION["domain_name"] = $_SESSION['domains'][$domain_uuid]['domain_name'];
 				$_SESSION['domain']['template']['name'] = $_SESSION['domains'][$domain_uuid]['template_name'];
+				$_SESSION["context"] = $_SESSION["domain_name"];
 
 			//clear the extension array so that it is regenerated for the selected domain
 				unset($_SESSION['extension_array']);
diff --git a/resources/check_auth.php b/resources/check_auth.php
index cbd266ba25..e7fe47e3c1 100644
--- a/resources/check_auth.php
+++ b/resources/check_auth.php
@@ -122,6 +122,7 @@
 					$_SESSION["domain_uuid"] = $result["domain_uuid"];
 					//$_SESSION["domain_name"] = $result["domain_name"];
 					$_SESSION["user_uuid"] = $result["user_uuid"];
+					$_SESSION["context"] = $result['domain_name'];
 
 				//user session array
 					$_SESSION["user"]["domain_uuid"] = $result["domain_uuid"];