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 00ca4a417e04dc6fd9968bbef635d3403e04234d..c481192e7f8166d22821f9f7096090dfa7fa2770 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
@@ -119,30 +119,26 @@ public class SettingsController implements Styleable
 		{
 			textFieldURL.setText(controller.getSettings().getUrl());
 			textFieldSecret.setText("******");
-			textFieldCurrency.setText(controller.getSettings().getCurrency());
-			if(controller.getSettings().isRestActivated())
-			{
-				radioButtonRestActivated.setSelected(true);
-			}
-			else
-			{
-				radioButtonRestDeactivated.setSelected(true);
-			}
-			setTextAreaTrustedHosts(controller.getSettings().getTrustedHosts());
-			
-			if(controller.getSettings().getLanguage() != null)
-			{
-				LanguageType language = controller.getSettings().getLanguage();
-				comboBoxLanguage.setValue(language);
-				previousLanguage = language;
-			}
-			
-			checkboxEnableAutoUpdate.setSelected(controller.getSettings().isAutoUpdateCheckEnabled());
+			textFieldCurrency.setText(controller.getSettings().getCurrency());		
+		}
+		
+		if(controller.getSettings().isRestActivated())
+		{
+			radioButtonRestActivated.setSelected(true);
 		}
 		else
 		{
 			radioButtonRestDeactivated.setSelected(true);
+		}		
+		setTextAreaTrustedHosts(controller.getSettings().getTrustedHosts());
+		if(controller.getSettings().getLanguage() != null)
+		{
+			LanguageType language = controller.getSettings().getLanguage();
+			comboBoxLanguage.setValue(language);
+			previousLanguage = language;
 		}
+		
+		checkboxEnableAutoUpdate.setSelected(controller.getSettings().isAutoUpdateCheckEnabled());
 	}
 	
 	private void refreshLabelsUpdate()
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SplashScreenController.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SplashScreenController.java
index 930e2539faa7401e8dbc5b1d36f1b656a629893b..28071b5355d3ce73337c65457637e12afd880ad5 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SplashScreenController.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/SplashScreenController.java
@@ -6,7 +6,6 @@ import de.deadlocker8.budgetmaster.logic.Settings;
 import de.deadlocker8.budgetmaster.logic.utils.Colors;
 import de.deadlocker8.budgetmaster.logic.utils.FileHelper;
 import de.deadlocker8.budgetmaster.logic.utils.Helpers;
-import de.deadlocker8.budgetmaster.logic.utils.LanguageType;
 import de.deadlocker8.budgetmaster.logic.utils.Strings;
 import de.deadlocker8.budgetmasterclient.ui.Styleable;
 import de.deadlocker8.budgetmasterclient.ui.customAlert.CustomAlertController;
@@ -98,7 +97,6 @@ public class SplashScreenController extends BaseController implements Styleable
 		if(settings == null)
 		{	
 			settings = new Settings();
-			settings.setLanguage(LanguageType.ENGLISH);
 			//first start of budgetmaster
 			Platform.runLater(() -> {
 				AlertGenerator.showAlert(AlertType.INFORMATION, 
diff --git a/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/Settings.java b/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/Settings.java
index aede2c726d25b69783474169bc49176f810fa418..a0dbe9f2ae1bfa96612bde1769ea1b7d2f492e62 100644
--- a/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/Settings.java
+++ b/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/Settings.java
@@ -22,10 +22,10 @@ public class Settings
 	private String url;
 	private String secret;
 	private String currency;
-	private boolean restActivated;
+	private boolean restActivated = true;
 	private ArrayList<String> trustedHosts;
-	private LanguageType language;
-	private boolean autoUpdateCheckEnabled;
+	private LanguageType language = LanguageType.ENGLISH;
+	private boolean autoUpdateCheckEnabled = true;
 	
 	public Settings()
 	{
diff --git a/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/utils/FileHelper.java b/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/utils/FileHelper.java
index 1f4353564f28e2e27f1c16258354effeff16df5e..e5fc1cdd230014cb5b65fb3debe0c2a26a5e3492 100644
--- a/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/utils/FileHelper.java
+++ b/BudgetMasterCore/src/main/java/de/deadlocker8/budgetmaster/logic/utils/FileHelper.java
@@ -34,7 +34,7 @@ public class FileHelper
 			reader.close();
 			return settings;
 		}
-		catch(IOException e)
+		catch(Exception e)
 		{
 			return null;
 		}