diff --git a/resources/check_auth.php b/resources/check_auth.php
index d1d27048ad..f553e3cc91 100644
--- a/resources/check_auth.php
+++ b/resources/check_auth.php
@@ -321,6 +321,39 @@ require_once "resources/require.php";
 			$_SESSION['permissions'] = $prep_statement_sub->fetchAll(PDO::FETCH_NAMED);
 			unset($sql, $prep_statement_sub);
 
+		//get the user settings
+			$sql = "select * from v_user_settings ";
+			$sql .= "where domain_uuid = '" . $_SESSION["domain_uuid"] . "' ";
+			$sql .= "and user_uuid = '" . $_SESSION["user_uuid"] . "' ";
+			$sql .= "and user_setting_enabled = 'true' ";
+			$prep_statement = $db->prepare($sql);
+			if ($prep_statement) {
+				$prep_statement->execute();
+				$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+				foreach ($result as $row) {
+					$name = $row['user_setting_name'];
+					$category = $row['user_setting_category'];
+					$subcategory = $row['user_setting_subcategory'];
+					if (strlen($subcategory) == 0) {
+						//$$category[$name] = $row['domain_setting_value'];
+						if ($name == "array") {
+							$_SESSION[$category][] = $row['user_setting_value'];
+						}
+						else {
+							$_SESSION[$category][$name] = $row['user_setting_value'];
+						}
+					} else {
+						//$$category[$subcategory][$name] = $row['domain_setting_value'];
+						if ($name == "array") {
+							$_SESSION[$category][$subcategory][] = $row['user_setting_value'];
+						}
+						else {
+							$_SESSION[$category][$subcategory][$name] = $row['user_setting_value'];
+						}
+					}
+				}
+			}
+
 		//redirect the user
 			if (check_str($_REQUEST["rdr"]) !== 'n'){
 				$path = check_str($_POST["path"]);
diff --git a/resources/classes/domains.php b/resources/classes/domains.php
index 5c82f5460c..9c38c7ef04 100644
--- a/resources/classes/domains.php
+++ b/resources/classes/domains.php
@@ -102,33 +102,35 @@
 				}
 
 			//get the user settings
-				$sql = "select * from v_user_settings ";
-				$sql .= "where domain_uuid = '" . $_SESSION["domain_uuid"] . "' ";
-				$sql .= "and user_uuid = '" . $_SESSION["user_uuid"] . "' ";
-				$sql .= "and user_setting_enabled = 'true' ";
-				$prep_statement = $db->prepare($sql);
-				if ($prep_statement) {
-					$prep_statement->execute();
-					$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-					foreach ($result as $row) {
-						$name = $row['user_setting_name'];
-						$category = $row['user_setting_category'];
-						$subcategory = $row['user_setting_subcategory'];
-						if (strlen($subcategory) == 0) {
-							//$$category[$name] = $row['domain_setting_value'];
-							if ($name == "array") {
-								$_SESSION[$category][] = $row['user_setting_value'];
-							}
-							else {
-								$_SESSION[$category][$name] = $row['user_setting_value'];
-							}
-						} else {
-							//$$category[$subcategory][$name] = $row['domain_setting_value'];
-							if ($name == "array") {
-								$_SESSION[$category][$subcategory][] = $row['user_setting_value'];
-							}
-							else {
-								$_SESSION[$category][$subcategory][$name] = $row['user_setting_value'];
+				if (strlen($_SESSION["user_uuid"]) > 0) {
+					$sql = "select * from v_user_settings ";
+					$sql .= "where domain_uuid = '" . $_SESSION["domain_uuid"] . "' ";
+					$sql .= "and user_uuid = '" . $_SESSION["user_uuid"] . "' ";
+					$sql .= "and user_setting_enabled = 'true' ";
+					$prep_statement = $db->prepare($sql);
+					if ($prep_statement) {
+						$prep_statement->execute();
+						$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+						foreach ($result as $row) {
+							$name = $row['user_setting_name'];
+							$category = $row['user_setting_category'];
+							$subcategory = $row['user_setting_subcategory'];
+							if (strlen($subcategory) == 0) {
+								//$$category[$name] = $row['domain_setting_value'];
+								if ($name == "array") {
+									$_SESSION[$category][] = $row['user_setting_value'];
+								}
+								else {
+									$_SESSION[$category][$name] = $row['user_setting_value'];
+								}
+							} else {
+								//$$category[$subcategory][$name] = $row['domain_setting_value'];
+								if ($name == "array") {
+									$_SESSION[$category][$subcategory][] = $row['user_setting_value'];
+								}
+								else {
+									$_SESSION[$category][$subcategory][$name] = $row['user_setting_value'];
+								}
 							}
 						}
 					}
@@ -152,29 +154,29 @@
 				}
 
 			//recordings add the domain to the path if there is more than one domains
-					if (count($_SESSION["domains"]) > 1) {
-						if (strlen($_SESSION['switch']['recordings']['dir']) > 0) {
-							if (substr($_SESSION['switch']['recordings']['dir'], -strlen($_SESSION["domain_name"])) != $_SESSION["domain_name"]) {
-								//get the default recordings directory
-								$sql = "select * from v_default_settings ";
-								$sql .= "where default_setting_enabled = 'true' ";
-								$sql .= "and default_setting_category = 'switch' ";
-								$sql .= "and default_setting_subcategory = 'recordings' ";
-								$sql .= "and default_setting_name = 'dir' ";
-								$prep_statement = $db->prepare($sql);
-								$prep_statement->execute();
-								$result_default_settings = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-								foreach ($result_default_settings as $row) {
-									$name = $row['default_setting_name'];
-									$category = $row['default_setting_category'];
-									$subcategory = $row['default_setting_subcategory'];
-									$switch_recordings_dir = $row['default_setting_value'];
-								}
-								//add the domain
-								$_SESSION['switch']['recordings']['dir'] = $switch_recordings_dir . '/' . $_SESSION["domain_name"];
+				if (count($_SESSION["domains"]) > 1) {
+					if (strlen($_SESSION['switch']['recordings']['dir']) > 0) {
+						if (substr($_SESSION['switch']['recordings']['dir'], -strlen($_SESSION["domain_name"])) != $_SESSION["domain_name"]) {
+							//get the default recordings directory
+							$sql = "select * from v_default_settings ";
+							$sql .= "where default_setting_enabled = 'true' ";
+							$sql .= "and default_setting_category = 'switch' ";
+							$sql .= "and default_setting_subcategory = 'recordings' ";
+							$sql .= "and default_setting_name = 'dir' ";
+							$prep_statement = $db->prepare($sql);
+							$prep_statement->execute();
+							$result_default_settings = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+							foreach ($result_default_settings as $row) {
+								$name = $row['default_setting_name'];
+								$category = $row['default_setting_category'];
+								$subcategory = $row['default_setting_subcategory'];
+								$switch_recordings_dir = $row['default_setting_value'];
 							}
+							//add the domain
+							$_SESSION['switch']['recordings']['dir'] = $switch_recordings_dir . '/' . $_SESSION["domain_name"];
 						}
 					}
+				}
 		}
 	}