diff --git a/core/install/install_first_time.php b/core/install/install_first_time.php
index e31be9e062..99f0ab043a 100644
--- a/core/install/install_first_time.php
+++ b/core/install/install_first_time.php
@@ -311,6 +311,7 @@ if(!$install_step) { $install_step = 'select_language'; }
 				$fusionPBX->install();
 				$switch->install();
 				$fusionPBX->app_defaults();
+				$detect_switch->restart_switch();
 			}catch(Exception $e){
 				echo "</pre>\n";
 				echo "<p><b>Failed to install</b><br/>" . $e->getMessage() . "</p>\n";
diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php
index 9c70cb7b2c..57ee0c6403 100644
--- a/core/install/resources/classes/install_fusionpbx.php
+++ b/core/install/resources/classes/install_fusionpbx.php
@@ -975,7 +975,7 @@ include "root.php";
 			}
 		}
 		
-		protected function app_defaults() {
+		public function app_defaults() {
 			$this->write_progress("Running app_defaults");
 			
 		//set needed session settings
diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index 97b12dd37a..715c2cef5b 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -176,9 +176,6 @@ include "root.php";
 		function install() {
 			$this->copy_conf();
 			$this->copy_scripts();
-			//tell freeswitch to restart
-			$this->write_progress("Restarting switch");
-			$this->detect_switch->restart_switch();
 		}
 
 		function upgrade() {