diff --git a/path-of-titans.kvp b/path-of-titans.kvp
index 76474a3..347d19d 100644
--- a/path-of-titans.kvp
+++ b/path-of-titans.kvp
@@ -22,7 +22,7 @@ App.ExecutableLinux=PathOfTitans/Binaries/Linux/PathOfTitansServer-Linux-Shippin
 App.WorkingDir=
 App.LinuxCommandLineArgs=
 App.WindowsCommandLineArgs=
-App.CommandLineArgs=PathOfTitans {{ServerMap}}?ServerName="{{ServerName}}" {{$PlatformArgs}} -log -Port={{$GamePort}} -QueryPort={{$QueryPort}} -RconPort={{$RCONPort}} -ServerPassword="{{ServerPassword}}" -RconPassword="{{$RemoteAdminPassword}}" -MultiHome={{$ApplicationIPBinding}} {{$FormattedArgs}}
+App.CommandLineArgs=PathOfTitans {{ServerMap}}?ServerName="{{ServerName}}" {{$PlatformArgs}} -log -Port={{$GamePort}} -QueryPort={{$QueryPort}} -RconPort={{$RCONPort}} -RconPassword="{{$RemoteAdminPassword}}" -MultiHome={{$ApplicationIPBinding}} {{$FormattedArgs}}
 App.AppSettings={}
 App.EnvironmentVariables={}
 App.CommandLineParameterFormat=-{0}={1}
diff --git a/path-of-titansconfig.json b/path-of-titansconfig.json
index 27264d3..4f0a2bd 100644
--- a/path-of-titansconfig.json
+++ b/path-of-titansconfig.json
@@ -68,14 +68,14 @@
     {
         "DisplayName":"Server Name",
         "Category":"POT Server Settings",
-        "Description":"Sets the public name of the server",
+        "Description":"Sets the public name of the server. To include spaces in the name displayed in the server list, you MUST use underscores to represent those spaces",
         "Keywords":"name,servername",
         "FieldName":"ServerName",
         "InputType":"text",
         "IsFlagArgument":false,
         "ParamFieldName":"ServerName",
         "IncludeInCommandLine":false,
-        "DefaultValue":"AMP Powered POT Server",
+        "DefaultValue":"AMP_Powered_POT_Server",
         "EnumValues":{}
     },
     {
@@ -100,6 +100,21 @@
         "InputType":"password",
         "IsFlagArgument":false,
         "ParamFieldName":"ServerPassword",
+        "IncludeInCommandLine":true,
+        "SkipIfEmpty":true,
+        "DefaultValue":"",
+        "EnumValues":{}
+    },
+    {
+        "DisplayName":"Server Password",
+        "Category":"POT Server Settings",
+        "Description":"",
+        "Keywords":"",
+        "FieldName":"ServerPassword",
+        "InputType":"password",
+        "Hidden":true,
+        "IsFlagArgument":false,
+        "ParamFieldName":"/Script/PathOfTitans.IGameSession.ServerPassword",
         "IncludeInCommandLine":false,
         "DefaultValue":"",
         "EnumValues":{}
diff --git a/path-of-titansmetaconfig.json b/path-of-titansmetaconfig.json
index 3e9bc0e..c77e967 100644
--- a/path-of-titansmetaconfig.json
+++ b/path-of-titansmetaconfig.json
@@ -1,4 +1,16 @@
 [
+    {    
+        "ConfigFile":"PathOfTitans/Saved/Config/WindowsServer/Game.ini",
+        "AutoMap":true,
+        "ConfigType":"ini",
+        "ConfigFormatRegex":"^(?<key>.+?)=(?<value>.*?)$"
+    },
+	{
+        "ConfigFile":"PathOfTitans/Saved/Config/LinuxServer/Game.ini",
+        "AutoMap":true,
+        "ConfigType":"ini",
+        "ConfigFormatRegex":"^(?<key>.+?)=(?<value>.*?)$"
+    },
     {
         "ConfigFile":"PathOfTitans/Saved/MOTD.txt",
         "ConfigType":"kvp",