diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index c7d6b4b27f..46b0970406 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -92,6 +92,39 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 			// fix null
 			$default_setting_order = ($default_setting_order != '') ? $default_setting_order : 'null';
 
+			//update switch variables
+			if ($category == "domain" && $subcategory == "time_zone" && $name == "name" ) {
+				//get the action
+					$sql = "select * from v_vars ";
+					$sql .= "where var_name = 'timezone' ";
+					$prep_statement = $db->prepare(check_sql($sql));
+					$prep_statement->execute();
+					$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
+					$var_action = "add"
+					foreach ($result as &$row) {
+						$var_action = "update"
+					}
+					unset ($prep_statement);
+
+				//update the timezone
+					if ($var_action == "update") {
+						$sql = "update from v_vars ";
+						$sql = "set var_value = '".$default_setting_value."' ";
+						$sql .= "where var_name = 'timezone' ";
+						$prep_statement = $db->prepare(check_sql($sql));
+						$prep_statement->execute();
+						unset($sql);
+					}
+					else {
+						$sql = "insert into v_vars ";
+						$sql .= "(var_uuid, var_name, var_value, var_cat, var_enabled) ";
+						$sql .= "values ('".uuid()."', 'timezone', '$default_setting_value', 'Defaults', 'true'); ";
+						$prep_statement = $db->prepare(check_sql($sql));
+						$prep_statement->execute();
+						unset($sql);
+					}
+			}
+
 			if ($action == "add" && permission_exists('default_setting_add')) {
 				$sql = "insert into v_default_settings ";
 				$sql .= "(";