diff --git a/src/gui/webtv_setup.h b/src/gui/webtv_setup.h
index 38af493e4..93c178efc 100644
--- a/src/gui/webtv_setup.h
+++ b/src/gui/webtv_setup.h
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <gui/widget/menue.h>
 
-#define WEBTV_XML	CONFIGDIR "/webtv_usr.xml"
+#define WEBTV_XML	WEBTVDIR_VAR "/webtv_usr.xml"
 #define WEBRADIO_XML	WEBRADIODIR_VAR "/webradio_usr.xml"
 
 class CWebTVSetup : public CMenuTarget, CChangeObserver
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 44f87c935..c7f04c13a 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -685,7 +685,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 	g_settings.timeshiftdir = configfile.getString( "timeshiftdir", "" );
 	g_settings.downloadcache_dir = configfile.getString( "downloadcache_dir", g_settings.network_nfs_recordingdir.c_str());
 	g_settings.last_webradio_dir = configfile.getString( "last_webradio_dir", WEBRADIODIR_VAR);
-	g_settings.last_webtv_dir = configfile.getString( "last_webtv_dir", CONFIGDIR);
+	g_settings.last_webtv_dir = configfile.getString( "last_webtv_dir", WEBTVDIR_VAR);
 
 	g_settings.temp_timeshift = configfile.getInt32( "temp_timeshift", 1 ); //NI
 	g_settings.auto_timeshift = configfile.getInt32( "auto_timeshift", 0 );