diff --git a/src/gui/personalize.cpp b/src/gui/personalize.cpp
index 81897f0fd..3e52acb4a 100644
--- a/src/gui/personalize.cpp
+++ b/src/gui/personalize.cpp
@@ -236,7 +236,7 @@ int CPersonalizeGui::exec(CMenuTarget* parent, const string & actionKey)
 		
 		if(actionKey == a_key) 
 		{                                     				// Personalize options menu
-			ShowMenuOptions(i);
+			res = ShowMenuOptions(i);
 			return res;
 		}
 	}
@@ -440,7 +440,7 @@ void CPersonalizeGui::ShowPluginMenu(CMenuWidget* p_widget)
 
 //Here we give the user the option to enable, disable, or PIN protect items on the Main Menu.
 //We also provide a means of PIN protecting the menu itself.
-void CPersonalizeGui::ShowMenuOptions(const int& widget)
+int CPersonalizeGui::ShowMenuOptions(const int& widget)
 {
 	string mn_name = v_widget[widget]->getName();
 	printf("[neutrino-personalize] exec %s...\n", __FUNCTION__);
@@ -516,10 +516,10 @@ void CPersonalizeGui::ShowMenuOptions(const int& widget)
 		
 	}
 	options_count = pm->getItemsCount();
-	pm->exec (NULL, "");
+	int res = pm->exec (NULL, "");
 	pm->hide ();
 	delete pm;
-
+	return res;
 }
 
 //returns true, if found an observer item
@@ -719,13 +719,19 @@ void CPersonalizeGui::addSeparator(const int& widget_id, const neutrino_locale_t
 //expands with parameter within you can show or hide this item in personalize options
 void CPersonalizeGui::addSeparator(CMenuWidget &widget, const neutrino_locale_t locale_text, const int& item_mode)
 {
+#if 0
 	menu_item_t to_add_sep[2] = {	{&widget, GenericMenuSeparatorLine, false, locale_text, NULL, item_mode, NULL}, 
 					{&widget, new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, locale_text), false, locale_text, NULL, item_mode, NULL}};
-	
-	if (locale_text == NONEXISTANT_LOCALE)
-		v_item.push_back(to_add_sep[0]);
-	else
-		v_item.push_back(to_add_sep[1]);
+#endif
+	if (locale_text == NONEXISTANT_LOCALE) {
+		//v_item.push_back(to_add_sep[0]);
+		menu_item_t to_add_sep = {&widget, GenericMenuSeparatorLine, false, locale_text, NULL, item_mode, NULL};
+		v_item.push_back(to_add_sep);
+	} else {
+		//v_item.push_back(to_add_sep[1]);
+		menu_item_t to_add_sep = {&widget, new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, locale_text), false, locale_text, NULL, item_mode, NULL};
+		v_item.push_back(to_add_sep);
+	}
 }
 
 //returns available count of personalized item for definied widget
diff --git a/src/gui/personalize.h b/src/gui/personalize.h
index ff8f2cef7..3c9c8a242 100644
--- a/src/gui/personalize.h
+++ b/src/gui/personalize.h
@@ -159,7 +159,7 @@ class CPersonalizeGui : public CMenuTarget, public CChangeObserver, public CPINP
 		std::vector<observ_menu_item_t> v_observ;
 				
 		int 	ShowPersonalizationMenu();
-		void 	ShowMenuOptions(const int& menu);
+		int 	ShowMenuOptions(const int& menu);
 		void 	ShowHelpPersonalize();
 		void 	ShowPinSetup(CMenuWidget* p_widget, CPINChangeWidget *pin_widget);
 		void 	ShowUserMenu(CMenuWidget* p_widget, std::vector<CUserMenuSetup*> &v_umenu);
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 3a3e87d9f..56846ca43 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -1848,6 +1848,7 @@ TIMER_START();
 
 	cpuFreq = new cCpuFreqManager();
 	cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
+	g_info.delivery_system = CFEManager::getInstance()->getLiveFE()->getInfo()->type == FE_QPSK ? DVB_S : DVB_C;
 #if HAVE_TRIPLEDRAGON
 	/* only SAT-hd1 before rev 8 has fan, rev 1 is TD (compat hack) */
 	g_info.has_fan = (cs_get_revision() > 1 && cs_get_revision() < 8 && g_info.delivery_system == DVB_S);
@@ -1875,7 +1876,6 @@ TIMER_START();
 	CEitManager::getInstance()->Start();
 #endif
 
-	g_info.delivery_system = CFEManager::getInstance()->getLiveFE()->getInfo()->type == FE_QPSK ? DVB_S : DVB_C;
 	if (!scanSettings.loadSettings(NEUTRINO_SCAN_SETTINGS_FILE, g_info.delivery_system)) {
 		dprintf(DEBUG_NORMAL, "Loading of scan settings failed. Using defaults.\n");
 	}