diff --git a/core/default_settings/app_defaults.php b/core/default_settings/app_defaults.php
index 6aad1b8563..528e2ed239 100644
--- a/core/default_settings/app_defaults.php
+++ b/core/default_settings/app_defaults.php
@@ -127,6 +127,166 @@ if ($domains_processed == 1) {
 		$array[$x]['default_setting_enabled'] = 'true';
 		$array[$x]['default_setting_description'] = '';
 		$x++;
+		$array[$x]['default_setting_category'] = 'login';
+		$array[$x]['default_setting_subcategory'] = 'password_reset_key';
+		$array[$x]['default_setting_name'] = 'text';
+		$array[$x]['default_setting_value'] = generate_password('20', '4');
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Display a Reset Password link on the login box (requires smtp_host be defined).';
+		$x++;
+		$array[$x]['default_setting_category'] = 'login';
+		$array[$x]['default_setting_subcategory'] = 'domain_name_visible';
+		$array[$x]['default_setting_name'] = 'boolean';
+		$array[$x]['default_setting_value'] = 'true';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Displays a domain input or select box (if domain_name array defined) on the login box.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'login';
+		$array[$x]['default_setting_subcategory'] = 'domain_name';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'pbx1.yourdomain.com';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Domain select option displayed on the login box.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'admin';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'voicemail';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard Voicemail block for users in the admin group.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'admin';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'missed';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard Missed Calls block for users in the admin group.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'admin';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'recent';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard Recent Calls block for users in the admin group.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'admin';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'limits';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard Domain Limits block for users in the admin group.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'admin';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'counts';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard Domain Counts block for users in the admin group.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'admin';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'call_routing';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard Call Routing controls for users in the admin group.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'admin';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'ring_groups';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard Ring Group Forwarding controls for users in the admin group.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'superadmin';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'voicemail';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard Voicemail block for users in the superadmin group.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'superadmin';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'missed';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard Missed Calls block for users in the superadmin group.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'superadmin';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'recent';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard Recent Calls block for users in the superadmin group.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'superadmin';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'limits';
+		$array[$x]['default_setting_enabled'] = 'false';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard Domain Limits block for users in the superadmin group.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'superadmin';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'counts';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard System Counts block for users in the superadmin group.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'superadmin';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'system';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard System Status block for users in the superadmin group.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'superadmin';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'call_routing';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard Call Routing controls for users in the superadmin group.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'superadmin';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'ring_groups';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard Ring Group Forwarding controls for users in the superadmin group.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'user';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'voicemail';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard Voicemail block for users in the users group.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'user';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'missed';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard Missed Calls block for users in the users group.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'user';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'recent';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard Recent Calls block for users in the users group.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'user';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'call_routing';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard Call Routing controls for users in the users group.';
+		$x++;
+		$array[$x]['default_setting_category'] = 'dashboard';
+		$array[$x]['default_setting_subcategory'] = 'user';
+		$array[$x]['default_setting_name'] = 'array';
+		$array[$x]['default_setting_value'] = 'ring_groups';
+		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_description'] = 'Enable Dashboard Ring Group Forwarding controls for users in the users group.';
 
 	//get an array of the default settings
 		$sql = "select * from v_default_settings ";
diff --git a/core/domain_settings/app_defaults.php b/core/domain_settings/app_defaults.php
index 2d613a83ca..dc350e8dbc 100644
--- a/core/domain_settings/app_defaults.php
+++ b/core/domain_settings/app_defaults.php
@@ -24,16 +24,6 @@
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
 
-//remove external from the end of the gateway path
-	if (substr($v_gateways_dir, -8) == "external") {
-		//$v_gateways_dir = substr($v_gateways_dir, 0, (strlen($v_gateways_dir)-9));
-		//$sql = "update v_domain_settings set ";
-		//$sql .= "v_gateways_dir = '$v_gateways_dir' ";
-		//$sql .= "where domain_uuid = '$domain_uuid'";
-		//$db->exec($sql);
-		//unset($sql);
-	}
-
 //proccess this only one time
 	if ($domains_processed == 1) {
 		//set domains with enabled status of empty or null to true
diff --git a/core/menu/app_defaults.php b/core/menu/app_defaults.php
index d9bbfe9303..69989e4b53 100644
--- a/core/menu/app_defaults.php
+++ b/core/menu/app_defaults.php
@@ -30,7 +30,7 @@
 		$o = new menu;
 		$o->db = $db;
 		$o->menu_default();
-		unset($menu);
+		unset($o);
 	} //if
 
 ?>
\ No newline at end of file
diff --git a/core/user_settings/app_defaults.php b/core/user_settings/app_defaults.php
deleted file mode 100644
index 2246ea21bb..0000000000
--- a/core/user_settings/app_defaults.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-
-if ($domains_processed == 1) {
-
-	//define array of settings
-		$x = 0;
-		$array[$x]['default_setting_category'] = 'login';
-		$array[$x]['default_setting_subcategory'] = 'password_reset_key';
-		$array[$x]['default_setting_name'] = 'text';
-		$array[$x]['default_setting_value'] = generate_password('20', '4');
-		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = 'Display a Reset Password link on the login box (requires smtp_host be defined).';
-		$x++;
-		$array[$x]['default_setting_category'] = 'login';
-		$array[$x]['default_setting_subcategory'] = 'domain_name_visible';
-		$array[$x]['default_setting_name'] = 'boolean';
-		$array[$x]['default_setting_value'] = 'true';
-		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = 'Displays a domain input or select box (if domain_name array defined) on the login box.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'login';
-		$array[$x]['default_setting_subcategory'] = 'domain_name';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'pbx1.yourdomain.com';
-		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = 'Domain select option displayed on the login box.';
-		$x++;
-
-	//iterate and add each, if necessary
-		foreach ($array as $index => $default_settings) {
-
-			//add theme default settings
-			$sql = "select count(*) as num_rows from v_default_settings ";
-			$sql .= "where default_setting_category = '".$default_settings['default_setting_category']."' ";
-			$sql .= "and default_setting_subcategory = '".$default_settings['default_setting_subcategory']."' ";
-			$sql .= "and default_setting_name = '".$default_settings['default_setting_name']."' ";
-			$prep_statement = $db->prepare($sql);
-			if ($prep_statement) {
-				$prep_statement->execute();
-				$row = $prep_statement->fetch(PDO::FETCH_ASSOC);
-				unset($prep_statement);
-				if ($row['num_rows'] == 0) {
-					$orm = new orm;
-					$orm->name('default_settings');
-					$orm->save($array[$index]);
-					$message = $orm->message;
-					//print_r($message);
-				}
-				unset($row);
-			}
-
-		}
-
-	//define array of dashboard settings
-		$x = 0;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'admin';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'voicemail';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard Voicemail block for users in the admin group.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'admin';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'missed';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard Missed Calls block for users in the admin group.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'admin';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'recent';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard Recent Calls block for users in the admin group.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'admin';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'limits';
-		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard Domain Limits block for users in the admin group.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'admin';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'counts';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard Domain Counts block for users in the admin group.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'admin';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'call_routing';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard Call Routing controls for users in the admin group.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'admin';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'ring_groups';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard Ring Group Forwarding controls for users in the admin group.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'superadmin';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'voicemail';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard Voicemail block for users in the superadmin group.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'superadmin';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'missed';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard Missed Calls block for users in the superadmin group.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'superadmin';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'recent';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard Recent Calls block for users in the superadmin group.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'superadmin';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'limits';
-		$array[$x]['default_setting_enabled'] = 'false';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard Domain Limits block for users in the superadmin group.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'superadmin';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'counts';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard System Counts block for users in the superadmin group.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'superadmin';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'system';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard System Status block for users in the superadmin group.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'superadmin';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'call_routing';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard Call Routing controls for users in the superadmin group.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'superadmin';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'ring_groups';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard Ring Group Forwarding controls for users in the superadmin group.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'user';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'voicemail';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard Voicemail block for users in the users group.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'user';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'missed';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard Missed Calls block for users in the users group.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'user';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'recent';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard Recent Calls block for users in the users group.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'user';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'call_routing';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard Call Routing controls for users in the users group.';
-		$x++;
-		$array[$x]['default_setting_category'] = 'dashboard';
-		$array[$x]['default_setting_subcategory'] = 'user';
-		$array[$x]['default_setting_name'] = 'array';
-		$array[$x]['default_setting_value'] = 'ring_groups';
-		$array[$x]['default_setting_enabled'] = 'true';
-		$array[$x]['default_setting_description'] = 'Enable Dashboard Ring Group Forwarding controls for users in the users group.';
-
-	//get an array of the default settings
-		$sql = "select * from v_default_settings ";
-		$sql .= "where default_setting_category = 'dashboard' ";
-		$prep_statement = $db->prepare($sql);
-		$prep_statement->execute();
-		$default_settings = $prep_statement->fetchAll(PDO::FETCH_NAMED);
-		unset ($prep_statement, $sql);
-
-	//find the missing default settings
-		$x = 0;
-		foreach ($array as $setting) {
-			$found = false;
-			$missing[$x] = $setting;
-			foreach ($default_settings as $row) {
-				if (trim($row['default_setting_subcategory']) == trim($setting['default_setting_subcategory'])) {
-					$found = true;
-					//remove items from the array that were found
-					unset($missing[$x]);
-				}
-			}
-			$x++;
-		}
-
-	//add the missing default settings
-		foreach ($missing as $row) {
-			//add the default settings
-			$orm = new orm;
-			$orm->name('default_settings');
-			$orm->save($row);
-			$message = $orm->message;
-			unset($orm);
-			//print_r($message);
-		}
-		unset($missing);
-
-	//unset the array variable
-		unset($array);
-
-}
-
-?>
\ No newline at end of file