diff --git a/src/gui/start_wizard.cpp b/src/gui/start_wizard.cpp
index 79b7168d3..29a4ef9fe 100644
--- a/src/gui/start_wizard.cpp
+++ b/src/gui/start_wizard.cpp
@@ -46,6 +46,8 @@
 #include "osd_setup.h"
 #include "osdlang_setup.h"
 #include "scan_setup.h"
+#include <zapit/zapit.h>
+#include <system/helpers.h>
 
 #include <gui/widget/messagebox.h>
 
@@ -103,6 +105,17 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/)
 			res = CScanSetup::getInstance()->exec(NULL, "");
 			CScanSetup::getInstance()->setWizardMode(CScanSetup::SCAN_SETUP_MODE_WIZARD_NO);
 		}
+		bool init_settings = file_exists("/var/tuxbox/config/initial/");
+		if(init_settings && (res != menu_return::RETURN_EXIT_ALL))
+		{
+			if (ShowMsgUTF(LOCALE_WIZARD_INITIAL_SETTINGS, g_Locale->getText(LOCALE_WIZARD_INSTALL_SETTINGS),
+				CMessageBox::mbrYes, CMessageBox::mbYes | CMessageBox::mbNo, NULL, 450, 30, false) == CMessageBox::mbrYes) {
+				system("/bin/cp /var/tuxbox/config/initial/* /var/tuxbox/config/zapit/");
+				CFEManager::getInstance()->loadSettings();
+				CFEManager::getInstance()->saveSettings();
+				CZapit::getInstance()->PrepareChannels();
+			}
+		}
 	}