diff --git a/unturned.kvp b/unturned.kvp
index 1ba499f..c0facd8 100644
--- a/unturned.kvp
+++ b/unturned.kvp
@@ -48,6 +48,7 @@ App.UniversalSleepApplicationUDPPortRef=ApplicationPort1
 App.UniversalSleepSteamQueryPortRef=QueryPort
 App.MaxUsers=10
 App.UseRandomAdminPassword=True
+App.PersistRandomPassword=True
 App.RemoteAdminPassword=
 App.AdminMethod=TelnetRCON
 App.AdminLoginTransform=None
diff --git a/unturnedconfig.json b/unturnedconfig.json
index cd2dd53..1a98ccb 100644
--- a/unturnedconfig.json
+++ b/unturnedconfig.json
@@ -41,19 +41,6 @@
         "DefaultValue": "27115",
         "EnumValues":{}
     },
-    {
-        "DisplayName": "RCON Password",
-        "Category": "Server Settings",
-        "Description": "",
-        "Keywords": "",
-        "FieldName": "$RemoteAdminPassword",
-        "InputType": "text",
-        "IsFlagArgument": false,
-        "Hidden":true,
-        "ParamFieldName": "/RocketSettings/RCON/@Password",
-        "IncludeInCommandLine": false,
-        "EnumValues":{}
-    },
     {
         "DisplayName": "Server Name",
         "Category": "Server Settings",
@@ -89,13 +76,25 @@
         "Description": "Password to connect to the server. Default is no password",
         "Keywords": "password",
         "FieldName": "Password",
-        "InputType": "RandomPassword",
+        "InputType": "password",
         "IsFlagArgument": false,
         "ParamFieldName": "Password",
         "IncludeInCommandLine": false,
         "DefaultValue": "",
         "EnumValues":{}
     },
+    {
+        "DisplayName": "RCON Password",
+        "Category": "Server Settings",
+        "Description": "See the Security and Privacy menu for configurable options for the server's RCON",
+        "Keywords": "rcon,password",
+        "FieldName": "$RemoteAdminPassword",
+        "InputType": "hidden",
+        "IsFlagArgument": false,
+        "ParamFieldName": "/RocketSettings/RCON/@Password",
+        "IncludeInCommandLine": false,
+        "EnumValues":{}
+    },
     {
         "DisplayName": "Owner",
         "Category": "Server Settings",