diff --git a/data/locale/english.locale b/data/locale/english.locale
index ed13b32d4..1f380ce5c 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -1305,7 +1305,7 @@ satsetup.diseqc_order Input order
 satsetup.diseqc_com_uncom Commited/Uncommited
 satsetup.diseqc_uncom_com Uncommited/Commited
 satsetup.comm_input Commited input
-satsetup.use_usals Use usals
+satsetup.use_usals Use usals for all
 satsetup.usals_repeat USALS command repeat
 satsetup.fastscan_head Fast scan (Astra 1, 19.2E, 12.515Mhz)
 satsetup.fastscan_type Scan type
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index d9fb63dce..113b96fb8 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -1231,7 +1231,7 @@ void CMoviePlayerGui::PlayFile(void)
 		}
 
 		if (exit) {
-printf("Exit, isMovieBrowser %d p_movie_info %x\n", isMovieBrowser, p_movie_info);
+//printf("Exit, isMovieBrowser %d p_movie_info %x\n", isMovieBrowser, p_movie_info);
 			if (isMovieBrowser == true && p_movie_info != NULL) {
 				// if we have a movie information, try to save the stop position
 				ftime(&current_time);
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index e0fad8cc8..d50caf23d 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -1570,6 +1570,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	configfile.setInt32( "screen_StartY_crt", g_settings.screen_StartY_crt );
 	configfile.setInt32( "screen_EndX_crt", g_settings.screen_EndX_crt );
 	configfile.setInt32( "screen_EndY_crt", g_settings.screen_EndY_crt );
+	configfile.setInt32( "screen_preset", g_settings.screen_preset );
 	configfile.setInt32( "screen_width", g_settings.screen_width);
 	configfile.setInt32( "screen_height", g_settings.screen_height);
 
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index 0efabaaf5..0a5ebd6dd 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -1013,6 +1013,8 @@ void CNeutrinoApp::InitScanSettings(CMenuWidget &settings)
 	int sfound = 0;
 	int dmode = scanSettings.diseqcMode;
 	int shortcut = 1;
+	int all_usals = 1;
+
 	CTPSelectHandler * tpSelect = new CTPSelectHandler();
 
 	CSatelliteSetupNotifier * satNotify = new CSatelliteSetupNotifier();
@@ -1067,6 +1069,8 @@ void CNeutrinoApp::InitScanSettings(CMenuWidget &settings)
 			CMenuOptionNumberChooser * motor = new CMenuOptionNumberChooser(LOCALE_SATSETUP_MOTOR_POS, &sit->second.motor_position, true, 0, 64, NULL, 0, 0, LOCALE_OPTIONS_OFF);
 			//CMenuOptionChooser * usals = new CMenuOptionChooser(LOCALE_EXTRA_USE_GOTOXX,  &sit->second.use_usals, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, dmode == DISEQC_ADVANCED);
 			CMenuOptionChooser * usals = new CMenuOptionChooser(LOCALE_EXTRA_USE_GOTOXX,  &sit->second.use_usals, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
+			if(!sit->second.use_usals)
+				all_usals = 0;
 
 			satNotify->addItem(1, diseqc);
 			satNotify->addItem(0, comm);
@@ -1154,6 +1158,9 @@ void CNeutrinoApp::InitScanSettings(CMenuWidget &settings)
 		toff = new CStringInput(LOCALE_EXTRA_LONG, (char *) zapit_long, 10, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789.");
 		motorMenu->addItem(new CMenuForwarder(LOCALE_EXTRA_LONG, true, zapit_long, toff));
 		motorMenu->addItem(new CMenuOptionNumberChooser(LOCALE_SATSETUP_USALS_REPEAT, (int *)&zapitCfg.repeatUsals, true, 0, 10, NULL, 0, 0, LOCALE_OPTIONS_OFF) );
+		CAllUsalsNotifier * usalsNotify = new CAllUsalsNotifier();
+		CMenuOptionChooser * allusals = new CMenuOptionChooser(LOCALE_SATSETUP_USE_USALS,  &all_usals, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, usalsNotify);
+		motorMenu->addItem(allusals);
 	}
 
 	if (!sfound && satellitePositions.size()) {
diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp
index 1c83b3a12..845d59751 100644
--- a/src/system/setting_helpers.cpp
+++ b/src/system/setting_helpers.cpp
@@ -63,6 +63,7 @@
 #include <pwrmngr.h>
 #include "libdvbsub/dvbsub.h"
 #include "libtuxtxt/teletext.h"
+#include <zapit/satconfig.h>
 
 extern CPlugins       * g_PluginList;    /* neutrino.cpp */
 extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
@@ -1003,3 +1004,15 @@ printf("CScreePresetNotifier::changeNotify preset %d (setting %d)\n", preset, g_
 	CFrameBuffer::getInstance()->Clear();
 	return true;
 }
+
+bool CAllUsalsNotifier::changeNotify(const neutrino_locale_t OptionName, void * data)
+{
+	int onoff = * (int *) data;
+printf("CAllUsalsNotifier::changeNotify: %s\n", onoff ? "ON" : "OFF");
+
+	sat_iterator_t sit;
+
+	for (sit = satellitePositions.begin(); sit != satellitePositions.end(); sit++) {
+		sit->second.use_usals = onoff;
+	}
+}
diff --git a/src/system/setting_helpers.h b/src/system/setting_helpers.h
index 49d3f30e5..e458b8cdf 100644
--- a/src/system/setting_helpers.h
+++ b/src/system/setting_helpers.h
@@ -311,4 +311,10 @@ class CScreePresetNotifier : public CChangeObserver
 public:
         bool changeNotify(const neutrino_locale_t, void * data);
 };
+
+class CAllUsalsNotifier : public CChangeObserver
+{
+public:
+        bool changeNotify(const neutrino_locale_t, void * data);
+};
 #endif