vanhofen@jessie:~/ni/buildsystem/source/ni-neutrino-hd[ni/mp/tuxbox]$ git diff
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 8b81a6d..5163a5b 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -929,17 +929,17 @@ int CNeutrinoApp::loadSetup(const char * fname)
        g_settings.audioplayer_enable_sc_metadata = configfile.getInt32("audioplayer_enable_sc_metadata",1);
        g_settings.shoutcast_dev_id = configfile.getString("shoutcast_dev_id","fa1669MuiRPorUBw"); //NI
        g_settings.shoutcast_enabled = configfile.getInt32("shoutcast_enabled", 1);
-       g_settings.shoutcast_enabled = check_shoutcast_dev_id();
+       g_settings.shoutcast_enabled = g_settings.shoutcast_enabled && check_shoutcast_dev_id();

        //Movie-Player
        g_settings.movieplayer_repeat_on = configfile.getInt32("movieplayer_repeat_on", CMoviePlayerGui::REPEAT_OFF);
        g_settings.movieplayer_bisection_jump = configfile.getInt32("movieplayer_bisection_jump", 5); //NI
        g_settings.youtube_dev_id = configfile.getString("youtube_dev_id","AIzaSyBLdZe7M3rpNMZqSj-3IEvjbb2hATWJIdM"); //NI
        g_settings.youtube_enabled = configfile.getInt32("youtube_enabled", 1);
-       g_settings.youtube_enabled = check_youtube_dev_id();
+       g_settings.youtube_enabled = g_settings.youtube_enabled && check_youtube_dev_id();
        g_settings.tmdb_api_key = configfile.getString("tmdb_api_key","7270f1b571c4ecbb5b204ddb7f8939b1"); //NI
        g_settings.tmdb_enabled = configfile.getInt32("tmdb_enabled", 1);
-       g_settings.tmdb_enabled = check_tmdb_api_key();
+       g_settings.tmdb_enabled = g_settings.tmdb_enabled && check_tmdb_api_key();

        //Filebrowser
        g_settings.filebrowser_showrights =  configfile.getInt32("filebrowser_showrights", 1);