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/resources/de/deadlocker8/budgetmaster/languages/_de.properties b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties
index a153dcf11e586d631e2d65c8784783234b11a934..55e45e1e3414143f22eecb9e6b3b5e7af0bcdac6 100644
--- a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties
+++ b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_de.properties
@@ -1,8 +1,8 @@
 # DEFAULT
 app.name=BudgetMaster
-version.code=12
+version.code=13
 version.name=1.8.0_alpha
-version.date=03.11.17
+version.date=07.11.17
 author=Robert Goldmann
 credits=L�nderflaggen von Freepik auf https://www.flaticon.com\nVerwendete Schriftarten: OpenSans
 
diff --git a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties
index 04f8fbe66c03bd9d9985854ed741a3f57f47a61d..3c21e8edd77b3ae80fe271c106b967df2d107476 100644
--- a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties
+++ b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/languages/_en.properties
@@ -1,8 +1,8 @@
 # DEFAULT
 app.name=BudgetMaster
-version.code=12
+version.code=13
 version.name=1.8.0_alpha
-version.date=03.11.17
+version.date=07.11.17
 author=Robert Goldmann
 credits=Flags by Freepik on https://www.flaticon.com\nFonts used: OpenSans
 
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 be49946656293efec9d25e6fa7ddc9e07c3bdb96..b6f809e40b2bb71e03a897ecad488896064ceb98 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;
 		}
diff --git a/build/BudgetMaster.exe b/build/BudgetMaster.exe
index 0f4c0fff491ee592e186261933027d17bfe91c68..bf497806ee234597f91f0a3891f68e4c836c2285 100644
Binary files a/build/BudgetMaster.exe and b/build/BudgetMaster.exe differ
diff --git a/build/BudgetMasterClient.jar b/build/BudgetMasterClient.jar
index 6c3b2d6f7990d693dbe847e1fff8ff1f33f0faad..2e38f51f849170e6c250a4b5fd10b95f0e274c84 100644
Binary files a/build/BudgetMasterClient.jar and b/build/BudgetMasterClient.jar differ
diff --git a/build/BudgetMasterServer.jar b/build/BudgetMasterServer.jar
index a66a4e59a296d091fdfa41123331d072273c6a6d..ec795a859b7993f3c0d6f012267de94560c6ff2b 100644
Binary files a/build/BudgetMasterServer.jar and b/build/BudgetMasterServer.jar differ