diff --git a/settings.properties b/settings.json
similarity index 87%
rename from settings.properties
rename to settings.json
index d2281ffa1e99ec74bc91d8b444c3a43dcf93f26b..b60e9bf038beddea9fb9d43d3543ffa1c2f56898 100644
--- a/settings.properties
+++ b/settings.json
@@ -6,5 +6,5 @@
 	"serverPort": 9000,
 	"serverSecret": "geheim",
 	"keystorePath": "",
-	"keystorePassword": ""
+	"keystorePassword": "geheim"
 }
\ No newline at end of file
diff --git a/src/de/deadlocker8/budgetmasterserver/main/Main.java b/src/de/deadlocker8/budgetmasterserver/main/Main.java
index 7db6b448d7ac9916d7e94e0b5a684efc265e3f1e..32f139cf59e6b614065fa5362b03372fca257be0 100644
--- a/src/de/deadlocker8/budgetmasterserver/main/Main.java
+++ b/src/de/deadlocker8/budgetmasterserver/main/Main.java
@@ -25,11 +25,11 @@ public class Main
 			Logger.error(e1);
 		}		
 		
-		if(!Files.exists(Paths.get("settings.properties")))
+		if(!Files.exists(Paths.get("settings.json")))
 		{
 			try
 			{
-				Files.copy(SparkServer.class.getClassLoader().getResourceAsStream("de/deadlocker8/budgetmasterserver/resources/settings.properties"), Paths.get("settings.properties"));
+				Files.copy(SparkServer.class.getClassLoader().getResourceAsStream("de/deadlocker8/budgetmasterserver/resources/settings.json"), Paths.get("settings.json"));
 			}
 			catch(IOException e)
 			{
diff --git a/src/de/deadlocker8/budgetmasterserver/main/Utils.java b/src/de/deadlocker8/budgetmasterserver/main/Utils.java
index 04772c1277300ac4e399fac81a21c75b758f339c..417375ffc23b3164fd3e54bbb54fc37c73534438 100644
--- a/src/de/deadlocker8/budgetmasterserver/main/Utils.java
+++ b/src/de/deadlocker8/budgetmasterserver/main/Utils.java
@@ -14,7 +14,7 @@ public class Utils
 		Settings settings;
 		
 		Gson gson = new Gson();
-		settingsJSON = new String(Files.readAllBytes(Paths.get("settings.properties")));		
+		settingsJSON = new String(Files.readAllBytes(Paths.get("settings.json")));		
 		settings = gson.fromJson(settingsJSON, Settings.class);	
 		return settings;		
 	}
diff --git a/src/de/deadlocker8/budgetmasterserver/resources/settings.properties b/src/de/deadlocker8/budgetmasterserver/resources/settings.json
similarity index 100%
rename from src/de/deadlocker8/budgetmasterserver/resources/settings.properties
rename to src/de/deadlocker8/budgetmasterserver/resources/settings.json