diff --git a/astroneer.kvp b/astroneer.kvp
index b626030..54ccdb5 100644
--- a/astroneer.kvp
+++ b/astroneer.kvp
@@ -27,7 +27,7 @@ App.AppSettings={}
 App.EnvironmentVariables={"LD_LIBRARY_PATH":"./linux64:%LD_LIBRARY_PATH%","SteamAppId":"361420","STEAM_COMPAT_DATA_PATH":"{{$FullRootDir}}1580130","STEAM_COMPAT_CLIENT_INSTALL_PATH":"{{$FullRootDir}}1580130"}
 App.CommandLineParameterFormat=-{0}={1}
 App.CommandLineParameterDelimiter= 
-App.ExitMethod=Kill
+App.ExitMethod=OS_CLOSE
 App.ExitTimeout=30
 App.ExitString=DSServerShutdown
 App.ExitFile=app_exit.lck
@@ -41,8 +41,8 @@ App.ApplicationPort2=0
 App.ApplicationPort3=0
 App.RemoteAdminPort=8778
 App.MaxUsers=8
-App.UseRandomAdminPassword=False
-App.RemoteAdminPassword=Password123
+App.UseRandomAdminPassword=True
+App.RemoteAdminPassword=
 App.AdminMethod=STDIO
 App.AdminLoginTransform=None
 App.RCONConnectDelaySeconds=5
diff --git a/astroneerconfig.json b/astroneerconfig.json
index 86d58d5..bc0e57e 100644
--- a/astroneerconfig.json
+++ b/astroneerconfig.json
@@ -38,6 +38,19 @@
         "IncludeInCommandLine":false,
         "EnumValues":{}
     },
+    {
+        "DisplayName":"Console Password",
+        "Category":"Server Settings",
+        "Description":"",
+        "Keywords":"",
+        "FieldName":"$RemoteAdminPassword",
+        "InputType":"text",
+        "Hidden":true,
+        "IsFlagArgument":false,
+        "ParamFieldName":"/Script/Astro.AstroServerSettings.ConsolePassword",
+        "IncludeInCommandLine":false,
+        "EnumValues":{}
+    },
     {
         "DisplayName":"Server Name",
         "Category":"Server Settings",
@@ -64,19 +77,6 @@
         "DefaultValue":"",
         "EnumValues":{}
     },
-    {
-        "DisplayName":"Console Password",
-        "Category":"Server Settings",
-        "Description":"Password required for remote console (admin) connections. NOTE: Change this after first installing the server!",
-        "Keywords":"console,admin,password",
-        "FieldName":"$RemoteAdminPassword",
-        "InputType":"RandomPassword",
-        "IsFlagArgument":false,
-        "ParamFieldName":"/Script/Astro.AstroServerSettings.ConsolePassword",
-        "IncludeInCommandLine":false,
-        "DefaultValue":"Password123",
-        "EnumValues":{}
-    },
     {
         "DisplayName":"Owner Name",
         "Category":"Server Settings",