Index: TFP-WebServer/CommandExtensions/ModInfo.xml
===================================================================
--- TFP-WebServer/CommandExtensions/ModInfo.xml	(revision 439)
+++ TFP-WebServer/CommandExtensions/ModInfo.xml	(revision 440)
@@ -5,5 +5,5 @@
 	<Description value="Additional commands for server operation" />
 	<Author value="The Fun Pimps LLC" />
-	<Version value="21.0.289.0" />
+	<Version value="21.0.293.0" />
 	<Website value="" />
 </xml>
Index: TFP-WebServer/MapRendering/ModInfo.xml
===================================================================
--- TFP-WebServer/MapRendering/ModInfo.xml	(revision 439)
+++ TFP-WebServer/MapRendering/ModInfo.xml	(revision 440)
@@ -5,5 +5,5 @@
 	<Description value="Render the game map to image map tiles as it is uncovered" />
 	<Author value="The Fun Pimps LLC" />
-	<Version value="21.0.289.0" />
+	<Version value="21.0.293.0" />
 	<Website value="" />
 </xml>
Index: TFP-WebServer/MarkersMod/ModInfo.xml
===================================================================
--- TFP-WebServer/MarkersMod/ModInfo.xml	(revision 439)
+++ TFP-WebServer/MarkersMod/ModInfo.xml	(revision 440)
@@ -5,5 +5,5 @@
 	<Description value="Allows placing custom markers on the web map" />
 	<Author value="Catalysm and Alloc" />
-	<Version value="21.0.289.0" />
+	<Version value="21.0.293.0" />
 	<Website value="" />
 </xml>
Index: TFP-WebServer/WebServer/ModInfo.xml
===================================================================
--- TFP-WebServer/WebServer/ModInfo.xml	(revision 439)
+++ TFP-WebServer/WebServer/ModInfo.xml	(revision 440)
@@ -5,5 +5,5 @@
 	<Description value="Integrated Webserver for the Web Dashboard and server APIs" />
 	<Author value="The Fun Pimps LLC" />
-	<Version value="21.0.289.3" />
+	<Version value="21.0.293.0" />
 	<Website value="" />
 </xml>
Index: TFP-WebServer/WebServer/src/Permissions/AdminApiTokens.cs
===================================================================
--- TFP-WebServer/WebServer/src/Permissions/AdminApiTokens.cs	(revision 439)
+++ TFP-WebServer/WebServer/src/Permissions/AdminApiTokens.cs	(revision 440)
@@ -117,5 +117,28 @@
 			}
 
+			if (IsCommandlineToken (_name, _secret)) {
+				return 0;
+			}
+
 			return int.MaxValue;
+		}
+
+		private bool commandlineChecked;
+		private string commandlineTokenName;
+		private string commandlineTokenSecret;
+
+		private bool IsCommandlineToken (string _name, string _secret) {
+			if (!commandlineChecked) {
+				commandlineTokenName = GameUtils.GetLaunchArgument ("webapitokenname");
+				commandlineTokenSecret = GameUtils.GetLaunchArgument ("webapitokensecret");
+
+				commandlineChecked = true;
+			}
+
+			if (string.IsNullOrEmpty (commandlineTokenName) || string.IsNullOrEmpty (commandlineTokenSecret)) {
+				return false;
+			}
+
+			return _name == commandlineTokenName && _secret == commandlineTokenSecret;
 		}
 
Index: TFP-WebServer/WebServer/src/UrlHandlers/AbsHandler.cs
===================================================================
--- TFP-WebServer/WebServer/src/UrlHandlers/AbsHandler.cs	(revision 439)
+++ TFP-WebServer/WebServer/src/UrlHandlers/AbsHandler.cs	(revision 440)
@@ -16,6 +16,6 @@
 		public abstract void HandleRequest (RequestContext _context);
 
-		public virtual bool IsAuthorizedForHandler (WebConnection _user, int _permissionLevel) {
-			return ModuleName == null || AdminWebModules.Instance.ModuleAllowedWithLevel (ModuleName, _permissionLevel);
+		public virtual bool IsAuthorizedForHandler (RequestContext _context) {
+			return ModuleName == null || AdminWebModules.Instance.ModuleAllowedWithLevel (ModuleName, _context.PermissionLevel);
 		}
 
Index: TFP-WebServer/WebServer/src/Web.cs
===================================================================
--- TFP-WebServer/WebServer/src/Web.cs	(revision 439)
+++ TFP-WebServer/WebServer/src/Web.cs	(revision 440)
@@ -271,5 +271,5 @@
 				}
 
-				if (!handler.IsAuthorizedForHandler (_context.Connection, _context.PermissionLevel)) {
+				if (!handler.IsAuthorizedForHandler (_context)) {
 					_context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
 					if (_context.Connection != null) {
Index: TFP-WebServer/bin/Mods/TFP_CommandExtensions/ModInfo.xml
===================================================================
--- TFP-WebServer/bin/Mods/TFP_CommandExtensions/ModInfo.xml	(revision 439)
+++ TFP-WebServer/bin/Mods/TFP_CommandExtensions/ModInfo.xml	(revision 440)
@@ -5,5 +5,5 @@
 	<Description value="Additional commands for server operation" />
 	<Author value="The Fun Pimps LLC" />
-	<Version value="21.0.289.0" />
+	<Version value="21.0.293.0" />
 	<Website value="" />
 </xml>
Index: TFP-WebServer/bin/Mods/TFP_MapRendering/ModInfo.xml
===================================================================
--- TFP-WebServer/bin/Mods/TFP_MapRendering/ModInfo.xml	(revision 439)
+++ TFP-WebServer/bin/Mods/TFP_MapRendering/ModInfo.xml	(revision 440)
@@ -5,5 +5,5 @@
 	<Description value="Render the game map to image map tiles as it is uncovered" />
 	<Author value="The Fun Pimps LLC" />
-	<Version value="21.0.289.0" />
+	<Version value="21.0.293.0" />
 	<Website value="" />
 </xml>
Index: TFP-WebServer/bin/Mods/TFP_WebServer/ModInfo.xml
===================================================================
--- TFP-WebServer/bin/Mods/TFP_WebServer/ModInfo.xml	(revision 439)
+++ TFP-WebServer/bin/Mods/TFP_WebServer/ModInfo.xml	(revision 440)
@@ -5,5 +5,5 @@
 	<Description value="Integrated Webserver for the Web Dashboard and server APIs" />
 	<Author value="The Fun Pimps LLC" />
-	<Version value="21.0.289.3" />
+	<Version value="21.0.293.0" />
 	<Website value="" />
 </xml>
Index: TFP-WebServer/bin/Mods/Xample_MarkersMod/ModInfo.xml
===================================================================
--- TFP-WebServer/bin/Mods/Xample_MarkersMod/ModInfo.xml	(revision 439)
+++ TFP-WebServer/bin/Mods/Xample_MarkersMod/ModInfo.xml	(revision 440)
@@ -5,5 +5,5 @@
 	<Description value="Allows placing custom markers on the web map" />
 	<Author value="Catalysm and Alloc" />
-	<Version value="21.0.289.0" />
+	<Version value="21.0.293.0" />
 	<Website value="" />
 </xml>