diff --git a/src/gui/weather_setup.cpp b/src/gui/weather_setup.cpp
index 25104f1fa..9031b24f7 100644
--- a/src/gui/weather_setup.cpp
+++ b/src/gui/weather_setup.cpp
@@ -113,8 +113,8 @@ int CWeatherSetup::showSelectWeatherLocation()
 	{
 		// TODO: localize hint
 		ShowHint("Warning", "Failed to load weather-favorites.xml or weather-locations.xml\nPlease press any key or wait some seconds! ...", 700, 10, NULL, NEUTRINO_ICON_HINT_IMAGEINFO, CComponentsHeader::CC_BTN_EXIT);
-		g_settings.weather_location = "52.52,13.40";
-		g_settings.weather_city = "Berlin";
+		g_settings.weather_location = WEATHER_DEFAULT_LOCATION;
+		g_settings.weather_city = WEATHER_DEFAULT_CITY;
 		CWeather::getInstance()->setCoords(g_settings.weather_location, g_settings.weather_city);
 		return menu_return::RETURN_REPAINT;
 	}
@@ -157,7 +157,8 @@ int CWeatherSetup::showSelectWeatherLocation()
 int CWeatherSetup::findLocation()
 {
 	int ret = menu_return::RETURN_REPAINT;
-	int postcode = 10178;
+
+	int postcode = WEATHER_DEFAULT_POSTCODE;
 	CIntInput zipcode(LOCALE_WEATHER_LOCATION_POSTCODE, &postcode, (unsigned int)5);
 	ret = zipcode.exec(NULL, "");
 	zipcode.hide();
diff --git a/src/gui/weather_setup.h b/src/gui/weather_setup.h
index ed614b799..eb13d48c8 100644
--- a/src/gui/weather_setup.h
+++ b/src/gui/weather_setup.h
@@ -21,6 +21,10 @@
 
 #define WEATHERDIR DATADIR "/neutrino/weather/"
 
+#define WEATHER_DEFAULT_CITY "Berlin"
+#define WEATHER_DEFAULT_LOCATION "52.52,13.40"
+#define WEATHER_DEFAULT_POSTCODE 10178
+
 #include <gui/widget/menue.h>
 
 #include <string>
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 23d5038aa..009e1a1e5 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -104,6 +104,7 @@
 #include "gui/videosettings.h"
 #include "gui/audio_select.h"
 #include "gui/weather.h"
+#include "gui/weather_setup.h"
 #include "gui/webchannels_setup.h"
 
 #include "gui/widget/hintbox.h"
@@ -1113,8 +1114,8 @@ int CNeutrinoApp::loadSetup(const char *fname)
 	g_settings.weather_enabled = configfile.getInt32("weather_enabled", 1);
 	g_settings.weather_enabled = g_settings.weather_enabled && CApiKey::check_weather_api_key();
 
-	g_settings.weather_location = configfile.getString("weather_location", "52.52,13.40");
-	g_settings.weather_city = configfile.getString("weather_city", "Berlin");
+	g_settings.weather_city = configfile.getString("weather_city", WEATHER_DEFAULT_CITY);
+	g_settings.weather_location = configfile.getString("weather_location", WEATHER_DEFAULT_LOCATION);
 
 	g_settings.youtube_dev_id = YT_DEV_KEY;
 #if ENABLE_YOUTUBE_KEY_MANAGE
@@ -2144,8 +2145,8 @@ void CNeutrinoApp::saveSetup(const char *fname)
 #endif
 	configfile.setInt32("weather_enabled", g_settings.weather_enabled);
 
-	configfile.setString("weather_location", g_settings.weather_location);
 	configfile.setString("weather_city", g_settings.weather_city);
+	configfile.setString("weather_location", g_settings.weather_location);
 
 #if ENABLE_YOUTUBE_KEY_MANAGE
 	configfile.setString("youtube_dev_id", g_settings.youtube_dev_id);
diff --git a/src/system/settings.h b/src/system/settings.h
index b5abce084..21099843f 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -913,8 +913,8 @@ struct SNeutrinoSettings
 	std::string weather_api_key;
 	int weather_enabled;
 
-	std::string weather_location;
 	std::string weather_city;
+	std::string weather_location;
 
 	std::string youtube_dev_id;
 	int youtube_enabled;