diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandSwitch.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandSwitch.java
index 5748203222e2325ba641368c294137d59f200ade..de02b9ba1dd3f394d18fe3504d42bf0b55df6f0a 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandSwitch.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandSwitch.java
@@ -63,6 +63,7 @@ public class CommandSwitch extends Command
 		
 		LanguageType previousLanguage = bundle.getParentController().getSettings().getLanguage();
 		bundle.getParentController().setSettings(FileHelper.loadSettings());
+		bundle.getParentController().getSettingsController().prefill();
 		RestartHandler restartHandler = new RestartHandler(bundle.getParentController());
 		restartHandler.handleRestart(previousLanguage);
 		bundle.getController().print(bundle.getString("switch.success"));
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java
index c6a43ee97742ff7e297b68284d8e8d513195c31f..25da0855bf8ab5817adb7aba1e54ce6087517b64 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java
@@ -419,6 +419,11 @@ public class Controller extends BaseController
 	{
 		return updater;
 	}
+	
+	public SettingsController getSettingsController()
+	{
+		return settingsController;
+	}
 
 	public void setFilterSettings(FilterSettings filterSettings)
 	{
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SettingsController.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SettingsController.java
index 13a76e2a41f715b79fe167147b8b61e8ddc82527..00ca4a417e04dc6fd9968bbef635d3403e04234d 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SettingsController.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SettingsController.java
@@ -96,6 +96,25 @@ public class SettingsController implements Styleable
 		previousLanguage = LanguageType.ENGLISH;
 		checkboxEnableAutoUpdate.setSelected(true);
 		
+		prefill();
+		
+		applyStyle();
+
+		textFieldURL.setPromptText(Localization.getString(Strings.URL_PLACEHOLDER));
+		textFieldCurrency.setPromptText(Localization.getString(Strings.CURRENCY_PLACEHOLDER));
+		textAreaTrustedHosts.setPromptText(Localization.getString(Strings.TRUSTED_HOSTS_PLACEHOLDER));
+
+		ToggleGroup toggleGroup = new ToggleGroup();
+		radioButtonRestActivated.setToggleGroup(toggleGroup);
+		radioButtonRestDeactivated.setToggleGroup(toggleGroup);
+		
+		hboxSettings.prefWidthProperty().bind(scrollPane.widthProperty().subtract(25));
+		
+		refreshLabelsUpdate();
+	}
+	
+	public void prefill()
+	{
 		if(controller.getSettings().isComplete())
 		{
 			textFieldURL.setText(controller.getSettings().getUrl());
@@ -124,20 +143,6 @@ public class SettingsController implements Styleable
 		{
 			radioButtonRestDeactivated.setSelected(true);
 		}
-		
-		applyStyle();
-
-		textFieldURL.setPromptText(Localization.getString(Strings.URL_PLACEHOLDER));
-		textFieldCurrency.setPromptText(Localization.getString(Strings.CURRENCY_PLACEHOLDER));
-		textAreaTrustedHosts.setPromptText(Localization.getString(Strings.TRUSTED_HOSTS_PLACEHOLDER));
-
-		ToggleGroup toggleGroup = new ToggleGroup();
-		radioButtonRestActivated.setToggleGroup(toggleGroup);
-		radioButtonRestDeactivated.setToggleGroup(toggleGroup);
-		
-		hboxSettings.prefWidthProperty().bind(scrollPane.widthProperty().subtract(25));
-		
-		refreshLabelsUpdate();
 	}
 	
 	private void refreshLabelsUpdate()