diff --git a/defaults/main.yml b/defaults/main.yml
index 024187c..24bba6e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -344,7 +344,7 @@ ChatRateLimitMs: 1000
 DieBelowDiskSpaceMb: 400
 ModIdBlackList: null
 ModIdWhiteList: null
-ServerIdentifier: a617d619-b910-41fb-827b-a6a748b78b7b
+ServerIdentifier: null
 LogBlockBreakPlace: false
 LogFileSplitAfterLine: 500000
 DieAboveErrorCount: 100000
diff --git a/templates/serverconfig.json.j2 b/templates/serverconfig.json.j2
index e035e3e..acd6369 100644
--- a/templates/serverconfig.json.j2
+++ b/templates/serverconfig.json.j2
@@ -2,22 +2,22 @@
   "FileEditWarning": "",
   "ConfigVersion": "1.8",
   "ServerName": "{{ ServerName }}",
-  "ServerUrl": null,
-  "ServerDescription": null,
-  "WelcomeMessage": "Welcome {0}, may you survive well and prosper",
+  "ServerUrl": {%if ServerUrl %}"{{ ServerUrl }}"{%else%}null{%endif%},
+  "ServerDescription": {%if ServerDescription %}"{{ ServerDescription }}"{%else%}null{%endif%},
+  "WelcomeMessage": {%if WelcomeMessage %}"{{ WelcomeMessage }}"{%else%}null{%endif%},
   "Ip": null,
   "Port": 42420,
   "Upnp": false,
   "CompressPackets": true,
-  "AdvertiseServer": false,
-  "MaxClients": 16,
-  "MaxClientsInQueue": 0,
+  "AdvertiseServer": {%if AdvertiseServer %}true{%else%}false{%endif%},
+  "MaxClients": {{ MaxClients }},
+  "MaxClientsInQueue": {{ MaxClientsInQueue }},
   "PassTimeWhenEmpty": false,
   "MasterserverUrl": "http://masterserver.vintagestory.at/api/v1/servers/",
   "ModDbUrl": "https://mods.vintagestory.at/",
   "ClientConnectionTimeout": 150,
   "EntityDebugMode": false,
-  "Password": null,
+  "Password": {%if Password %}"{{ Password }}"{%else%}null{%endif%},
   "MapSizeX": 1024000,
   "MapSizeY": 256,
   "MapSizeZ": 1024000,
@@ -330,23 +330,23 @@
   ],
   "AntiAbuse": 0,
   "WorldConfig": {
-    "Seed": null,
-    "SaveFileLocation": "/gamedata/vs/Saves/default.vcdbs",
-    "WorldName": "A new world",
-    "AllowCreativeMode": true,
-    "PlayStyle": "surviveandbuild",
-    "PlayStyleLangCode": "surviveandbuild-bands",
-    "WorldType": "standard",
-    "WorldConfiguration": null,
-    "MapSizeY": null,
-    "CreatedByPlayerName": null,
-    "DisabledMods": null,
-    "RepairMode": false
+    "Seed": {%if WorldConfig['Seed']%}{{ WorldConfig['Seed'] }}{%else%}null{%endif%},
+    "SaveFileLocation": "{{ WorldConfig['SaveFileLocation'] }}",
+    "WorldName": "{{ WorldConfig['WorldName'] }}",
+    "AllowCreativeMode": {%if WorldConfig['AllowCreativeMode']%}true{%else%}false{%endif%},
+    "PlayStyle": "{{ WorldConfig['PlayStyle'] }}",
+    "PlayStyleLangCode": "{{ WorldConfig['PlayStyleLangCode'] }}",
+    "WorldType": "{{ WorldConfig['WorldType'] }}",
+    "WorldConfiguration": {%if WorldConfig['WorldConfiguration']%}"{{ WorldConfig['WorldConfiguration'] }}"{%else%}null{%endif%},
+    "MapSizeY": {%if WorldConfig['MapSizeY']%}"{{ WorldConfig['MapSizeY'] }}"{%else%}null{%endif%},
+    "CreatedByPlayerName": {%if WorldConfig['CreatedByPlayerName']%}"{{ WorldConfig['CreatedByPlayerName'] }}"{%else%}null{%endif%},
+    "DisabledMods": {%if WorldConfig['DisabledMods']%}"{{ WorldConfig['DisabledMods'] }}"{%else%}null{%endif%},
+    "RepairMode": {%if WorldConfig['RepairMode']%}true{%else%}false{%endif%}
   },
   "NextPlayerGroupUid": 10,
   "GroupChatHistorySize": 20,
   "MaxOwnedGroupChannelsPerUser": 10,
-  "OnlyWhitelisted": false,
+  "OnlyWhitelisted": {%if OnlyWhitelisted %}true{%else%}false{%endif%},
   "WhitelistMode": 0,
   "VerifyPlayerAuth": true,
   "DefaultSpawn": null,
@@ -355,7 +355,7 @@
   "AllowFallingBlocks": true,
   "HostedMode": false,
   "HostedModeAllowMods": false,
-  "StartupCommands": "{{ StartupCommands }}",
+  "StartupCommands": {%if StartupCommands %}"{{ StartupCommands }}"{%else%}null{%endif%},
   "RepairMode": false,
   "AnalyzeMode": false,
   "CorruptionProtection": true,
@@ -364,7 +364,7 @@
   "DieBelowDiskSpaceMb": 400,
   "ModIdBlackList": null,
   "ModIdWhiteList": null,
-  "ServerIdentifier": "a617d619-b910-41fb-827b-a6a748b78b7b",
+  "ServerIdentifier": {%if ServerIdentifier%}"{{ ServerIdentifier }}"{%else%}null{%endif%},
   "LogBlockBreakPlace": false,
   "LogFileSplitAfterLine": 500000,
   "DieAboveErrorCount": 100000,