diff --git a/insurgencysandstorm.kvp b/insurgencysandstorm.kvp
index 8eca38e..28721c7 100644
--- a/insurgencysandstorm.kvp
+++ b/insurgencysandstorm.kvp
@@ -3,7 +3,7 @@ App.ApplicationPort1=27102
 App.ApplicationPort2=27131
 App.ApplicationReadyMode=RCONConnected
 App.BaseDirectory=./insurgencysandstorm/581330/
-App.CommandLineArgs={{Map}}?Scenario={{Scenario}}?password={{Password}}?MaxPlayers={{$MaxUsers}} -Port={{$ApplicationPort1}} -QueryPort={{$ApplicationPort2}} -Rcon -RconPassword={{$RemoteAdminPassword}} -RconListenPort={{$RemoteAdminPort}} -log -GameStats {{$FormattedArgs}}
+App.CommandLineArgs=App.CommandLineArgs={{Map}}?Scenario={{Scenario}}{{password_enabled}}{{Password}}?MaxPlayers={{$MaxUsers}} -Port={{$ApplicationPort1}} -QueryPort={{$ApplicationPort2}} -Rcon -RconPassword={{$RemoteAdminPassword}} -RconListenPort={{$RemoteAdminPort}} -log -GameStats {{$FormattedArgs}}
 App.CommandLineParameterDelimiter= 
 App.CommandLineParameterFormat=-{0}="{1}"
 App.DisplayName=InsurgencySandstorm
diff --git a/insurgencysandstormconfig.json b/insurgencysandstormconfig.json
index 90b533e..f1f3b61 100644
--- a/insurgencysandstormconfig.json
+++ b/insurgencysandstormconfig.json
@@ -87,7 +87,7 @@
         "Description": "Sets a password for the server",
         "Keywords": "Password",
         "FieldName": "Password",
-        "InputType": "text",
+        "InputType": "password",
         "IsFlagArgument": false,
         "ParamFieldName": "Password",
         "IncludeInCommandLine": false,
@@ -95,6 +95,22 @@
         "EnumValues": {},
         "SkipIfEmpty": true
     },
+    {
+        "DisplayName": "Password Enabled",
+        "Category": "Server Config",
+        "Description": "Enables the server password",
+        "Keywords": "Password",
+        "FieldName": "password_enabled",
+        "InputType": "checkbox",
+        "IsFlagArgument": false,
+        "ParamFieldName": "password_enabled",
+        "IncludeInCommandLine": false,
+        "DefaultValue": "",
+        "EnumValues": {
+            "False": "",
+            "True": "?password="
+        }
+    },  
     {
         "DisplayName": "Mutator",
         "Category": "Server Config",