diff --git a/core/domain_settings/domains.php b/core/domain_settings/domains.php
index b41dcf07a8..542cfb8d1e 100644
--- a/core/domain_settings/domains.php
+++ b/core/domain_settings/domains.php
@@ -71,24 +71,24 @@ else {
 				$_SESSION['domain_uuid'] = $domain_uuid;
 				$_SESSION["domain_name"] = $_SESSION['domains'][$domain_uuid]['domain_name'];
 				$_SESSION['domain']['template']['name'] = $_SESSION['domains'][$domain_uuid]['template_name'];
-			//clear the menu session so that it is regenerated for the selected domain
-				$_SESSION["menu"] = '';
+
 			//clear the extension array so that it is regenerated for the selected domain
 				unset($_SESSION['extension_array']);
+
 			//set the setting arrays
 				$domain = new domains();
 				$domain->db = $db;
 				$domain->set();
 
 			// on domain change, redirect user
-			if ($_SESSION["login"]["destination"] != '') {
-				// to default, or domain specific, login destination
-				header("Location: ".PROJECT_PATH.$_SESSION["login"]["destination"]["url"]);
-			}
-			else {
-				header("Location: ".PROJECT_PATH."/core/user_settings/user_dashboard.php");
-			}
-			return;
+				if ($_SESSION["login"]["destination"] != '') {
+					// to default, or domain specific, login destination
+					header("Location: ".PROJECT_PATH.$_SESSION["login"]["destination"]["url"]);
+				}
+				else {
+					header("Location: ".PROJECT_PATH."/core/user_settings/user_dashboard.php");
+				}
+				return;
 		}
 	}
 
diff --git a/resources/classes/domains.php b/resources/classes/domains.php
index 9c38c7ef04..ebe7d94512 100644
--- a/resources/classes/domains.php
+++ b/resources/classes/domains.php
@@ -82,21 +82,23 @@
 					$name = $row['domain_setting_name'];
 					$category = $row['domain_setting_category'];
 					$subcategory = $row['domain_setting_subcategory'];
-					if (strlen($subcategory) == 0) {
-						//$$category[$name] = $row['domain_setting_value'];
-						if ($name == "array") {
-							$_SESSION[$category][] = $row['domain_setting_value'];
-						}
-						else {
-							$_SESSION[$category][$name] = $row['domain_setting_value'];
-						}
-					} else {
-						//$$category[$subcategory][$name] = $row['domain_setting_value'];
-						if ($name == "array") {
-							$_SESSION[$category][$subcategory][] = $row['domain_setting_value'];
-						}
-						else {
-							$_SESSION[$category][$subcategory][$name] = $row['domain_setting_value'];
+					if (strlen($row['domain_setting_value']) > 0) {
+						if (strlen($subcategory) == 0) {
+							//$$category[$name] = $row['domain_setting_value'];
+							if ($name == "array") {
+								$_SESSION[$category][] = $row['domain_setting_value'];
+							}
+							else {
+								$_SESSION[$category][$name] = $row['domain_setting_value'];
+							}
+						} else {
+							//$$category[$subcategory][$name] = $row['domain_setting_value'];
+							if ($name == "array") {
+								$_SESSION[$category][$subcategory][] = $row['domain_setting_value'];
+							}
+							else {
+								$_SESSION[$category][$subcategory][$name] = $row['domain_setting_value'];
+							}
 						}
 					}
 				}
@@ -115,21 +117,23 @@
 							$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($row['user_setting_value']) > 0) {
+								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'];
+									}
 								}
 							}
 						}