diff --git a/app/modules/app_defaults.php b/app/modules/app_defaults.php
index a42648775d..84dfe431ed 100644
--- a/app/modules/app_defaults.php
+++ b/app/modules/app_defaults.php
@@ -28,7 +28,7 @@
 	if ($domains_processed == 1) {
 
 		//add missing switch directories in default settings
-			$obj = new freeswitch;
+			$obj = new switch_settings;
 			$obj->settings();
 			unset($obj);
 
diff --git a/resources/classes/freeswitch.php b/resources/classes/switch_settings.php
similarity index 94%
rename from resources/classes/freeswitch.php
rename to resources/classes/switch_settings.php
index 1d0479ed2d..ccdfb24b46 100644
--- a/resources/classes/freeswitch.php
+++ b/resources/classes/switch_settings.php
@@ -1,11 +1,11 @@
 <?php
 
 /**
- * freeswitch class provides access methods related to FreeSWITCH
+ * switch_settings class provides access methods related to FreeSWITCH
  *
  * @method settings will add missing switch directories to default settings
  */
-class freeswitch {
+class switch_settings {
 
 	public $db;
 	public $event_socket_ip_address;
@@ -232,8 +232,10 @@ class freeswitch {
 
 		//set the default settings
 			foreach ($array as $row) {
-				if (!isset($_SESSION['switch'][$row['default_setting_subcategory']] && $row['default_setting_enabled'] != "false")) {
-					$_SESSION['switch'][$row['default_setting_subcategory']] = $row['default_setting_value'];
+				if (!isset($_SESSION['switch'][$row['default_setting_subcategory']])) {
+					if ($row['default_setting_enabled'] != "false") {
+						$_SESSION['switch'][$row['default_setting_subcategory']] = $row['default_setting_value'];
+					}
 				}
 			}