diff --git a/app/switch/app_config.php b/app/switch/app_config.php
index 31243f8db1..595bb4c265 100644
--- a/app/switch/app_config.php
+++ b/app/switch/app_config.php
@@ -5,7 +5,7 @@
 		$apps[$x]['uuid'] = "9cc48cb9-22d3-42eb-8bf8-3ca970e364d7";
 		$apps[$x]['category'] = "Switch";
 		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "1.0";
+		$apps[$x]['version'] = "1.1";
 		$apps[$x]['license'] = "";
 		$apps[$x]['url'] = "http://www.fusionpbx.com";
 		$apps[$x]['description']['en-us'] = "Switch details such as version, uptime, channels and registrations.";
@@ -81,5 +81,69 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
-
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7ca40076-b66b-4fe5-90e8-ceb4fe27391c";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "switch";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "event_socket_ip_address";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "127.0.0.1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "IP Address used to connect to event socket.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "570804f2-65b9-423a-9758-f09c1b4b1482";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "switch";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "event_socket_port";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "8021";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Port to connect to event socket.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "ecd4923b-8396-4d83-b52d-809fe179f93a";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "switch";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "event_socket_password";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "ClueCon";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Password to connect to event socket.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2541e9e5-ac09-46f2-8d22-ebc3756b22b7";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "switch";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "event_socket_acl";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Access control list required to connect to event socket.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "90c7638c-8ecc-4210-bd7b-c301aef3ae7a";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "switch";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "xml_rpc_http_port";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "8080";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d7a91830-6faf-4b26-80e6-c9f9e1898425";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "switch";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "xml_rpc_auth_realm";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "freeswitch";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4a1a4b4c-1a5b-45bb-8393-36c1cb42c875";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "switch";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "xml_rpc_auth_user";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "freeswitch";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "8b51edfe-13f7-4ca3-989a-516072bec0b7";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "switch";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "xml_rpc_auth_pass";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "works";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
+		$y++;
 ?>
diff --git a/app/switch/app_defaults.php b/app/switch/app_defaults.php
index 3642e360c5..7540abeadf 100644
--- a/app/switch/app_defaults.php
+++ b/app/switch/app_defaults.php
@@ -32,6 +32,104 @@ if ($domains_processed == 1) {
 	$obj = new scripts;
 	$obj->copy_files();
 
+	//move the default settings
+	$database = new database;
+	if ($database->table_exists('v_settings')) {
+
+		$sql = "select * from v_settings ";
+		$database = new database;
+		$row = $database->select($sql, null, 'row');
+		if (!empty($row)) {
+
+			//initialize the setting object
+			$setting = new settings(["category" => "switch"]);
+
+			//save the default settings
+			if ($setting->get('switch', 'event_socket_ip_address') !== $row["event_socket_ip_address"]) {
+				$array['setting_uuid'] = "7ca40076-b66b-4fe5-90e8-ceb4fe27391c";
+				$array['setting_category'] = "switch";
+				$array['setting_subcategory'] = "event_socket_ip_address";
+				$array['setting_name'] = "text";
+				$array['setting_value'] = $row["event_socket_ip_address"];
+				$array['setting_enabled'] = "true";
+				$array['setting_description'] = "";
+				$setting->set($array);
+			}
+			if ($setting->get('switch', 'event_socket_port') !== $row["event_socket_port"]) {
+				$array['setting_uuid'] = "570804f2-65b9-423a-9758-f09c1b4b1482";
+				$array['setting_category'] = "switch";
+				$array['setting_subcategory'] = "event_socket_port";
+				$array['setting_name'] = "numeric";
+				$array['setting_value'] = $row["event_socket_port"];
+				$array['setting_enabled'] = "true";
+				$array['setting_description'] = "";
+				$setting->set($array);
+			}
+			if ($setting->get('switch', 'event_socket_password') !== $row["event_socket_password"]) {
+				$array['setting_uuid'] = "ecd4923b-8396-4d83-b52d-809fe179f93a";
+				$array['setting_category'] = "switch";
+				$array['setting_subcategory'] = "event_socket_password";
+				$array['setting_name'] = "text";
+				$array['setting_value'] = $row["event_socket_password"];
+				$array['setting_enabled'] = "true";
+				$array['setting_description'] = "";
+				$setting->set($array);
+			}
+			if ($setting->get('switch', 'event_socket_acl') !== $row["event_socket_acl"]) {
+				$array['setting_uuid'] = "2541e9e5-ac09-46f2-8d22-ebc3756b22b7";
+				$array['setting_category'] = "switch";
+				$array['setting_subcategory'] = "event_socket_acl";
+				$array['setting_name'] = "text";
+				$array['setting_value'] = $row["event_socket_acl"];
+				$array['setting_enabled'] = (empty($row["event_socket_acl"])) ? "false" : "true";
+				$array['setting_description'] = "";
+				$setting->set($array);
+			}
+			if ($setting->get('switch', 'xml_rpc_http_port') !== $row["xml_rpc_http_port"]) {
+				$array['setting_uuid'] = "90c7638c-8ecc-4210-bd7b-c301aef3ae7a";
+				$array['setting_category'] = "switch";
+				$array['setting_subcategory'] = "xml_rpc_http_port";
+				$array['setting_name'] = "numeric";
+				$array['setting_value'] = $row["xml_rpc_http_port"];
+				$array['setting_enabled'] = "true";
+				$array['setting_description'] = "";
+				$setting->set($array);
+			}
+			if ($setting->get('switch', 'xml_rpc_auth_realm') !== $row["xml_rpc_auth_realm"]) {
+				$array['setting_uuid'] = "d7a91830-6faf-4b26-80e6-c9f9e1898425";
+				$array['setting_category'] = "switch";
+				$array['setting_subcategory'] = "xml_rpc_auth_realm";
+				$array['setting_name'] = "text";
+				$array['setting_value'] = $row["xml_rpc_auth_realm"];
+				$array['setting_enabled'] = "true";
+				$array['setting_description'] = "";
+				$setting->set($array);
+			}
+			if ($setting->get('switch', 'xml_rpc_auth_user') !== $row["xml_rpc_auth_user"]) {
+				$array['setting_uuid'] = "4a1a4b4c-1a5b-45bb-8393-36c1cb42c875";
+				$array['setting_category'] = "switch";
+				$array['setting_subcategory'] = "xml_rpc_auth_user";
+				$array['setting_name'] = "text";
+				$array['setting_value'] = $row["xml_rpc_auth_user"];
+				$array['setting_enabled'] = "true";
+				$array['setting_description'] = "";
+				$setting->set($array);
+			}
+			if ($setting->get('switch', 'xml_rpc_auth_pass') !== $row["xml_rpc_auth_pass"]) {
+				$array['setting_uuid'] = "8b51edfe-13f7-4ca3-989a-516072bec0b7";
+				$array['setting_category'] = "switch";
+				$array['setting_subcategory'] = "xml_rpc_auth_pass";
+				$array['setting_name'] = "text";
+				$array['setting_value'] = $row["xml_rpc_auth_pass"];
+				$array['setting_enabled'] = "true";
+				$array['setting_description'] = "";
+				$setting->set($array);
+			}
+	
+		}
+		unset($sql, $row);
+	}
+
 }
 
 ?>