diff --git a/resources/login.php b/resources/login.php
index 79fbd1c94a..6e784e3ea6 100644
--- a/resources/login.php
+++ b/resources/login.php
@@ -29,8 +29,11 @@
 	$text = $language->get(null,'core/user_settings');
 
 //get the http values and set as variables
-	$path = check_str($_GET["path"]);
-	$msg = check_str($_GET["msg"]);
+	if (isset($_GET["path"])) { $path = check_str($_GET["path"]); } else { $path = null; }
+	if (isset($_GET["msg"])) { $msg = check_str($_GET["msg"]); } else { $msg = null; }
+
+//set variable if not set
+	if (!isset($_SESSION['login']['domain_name_visible']['boolean'])) { $_SESSION['login']['domain_name_visible']['boolean'] = null; }
 
 //set a default login destination
 	if (strlen($_SESSION['login']['destination']['url']) == 0) {