diff --git a/Cargo.lock b/Cargo.lock
index 5767ff1..c51a42b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2692,9 +2692,9 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
 
 [[package]]
 name = "poem"
-version = "1.3.40"
+version = "1.3.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16d0fec4acc8779b696e3ff25527884fb17cda6cf59a249c57aa1af1e2f65b36"
+checksum = "c4216504241ea26ae80929e341c5b1b6641c324a3ba99c22ea8f4b961a789e04"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2739,9 +2739,9 @@ dependencies = [
 
 [[package]]
 name = "poem-derive"
-version = "1.3.40"
+version = "1.3.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee7e20b5c7c573862cbc21e8f85682cc1f04766a318691837e8aa27df66857e6"
+checksum = "8b9d9ed7ff541340cbbc168a1beb6a34ac08a8956b3f670413f461abaa946b6e"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
diff --git a/warpgate-admin/Cargo.toml b/warpgate-admin/Cargo.toml
index 4c3c483..8d18ce1 100644
--- a/warpgate-admin/Cargo.toml
+++ b/warpgate-admin/Cargo.toml
@@ -12,7 +12,7 @@ chrono = "0.4"
 futures = "0.3"
 hex = "0.4"
 mime_guess = { version = "2.0", default_features = false }
-poem = { version = "^1.3.40", features = [
+poem = { version = "^1.3.42", features = [
     "cookie",
     "session",
     "anyhow",
diff --git a/warpgate-common/Cargo.toml b/warpgate-common/Cargo.toml
index 1a4bc60..474f73c 100644
--- a/warpgate-common/Cargo.toml
+++ b/warpgate-common/Cargo.toml
@@ -17,7 +17,7 @@ lazy_static = "1.4"
 futures = "0.3"
 once_cell = "1.14"
 password-hash = "0.4"
-poem = { version = "^1.3.40", features = ["rustls"] }
+poem = { version = "^1.3.42", features = ["rustls"] }
 poem-openapi = { version = "^2.0.10", features = [
     "swagger-ui",
     "chrono",
diff --git a/warpgate-core/Cargo.toml b/warpgate-core/Cargo.toml
index a507564..203f2a9 100644
--- a/warpgate-core/Cargo.toml
+++ b/warpgate-core/Cargo.toml
@@ -21,7 +21,7 @@ futures = "0.3"
 once_cell = "1.14"
 packet = "0.1"
 password-hash = "0.4"
-poem = { version = "^1.3.37", features = ["rustls"] }
+poem = { version = "^1.3.42", features = ["rustls"] }
 poem-openapi = { version = "^2.0.10", features = [
     "swagger-ui",
     "chrono",
diff --git a/warpgate-protocol-http/Cargo.toml b/warpgate-protocol-http/Cargo.toml
index de8bfde..ff328b4 100644
--- a/warpgate-protocol-http/Cargo.toml
+++ b/warpgate-protocol-http/Cargo.toml
@@ -14,7 +14,7 @@ delegate = "0.6"
 futures = "0.3"
 http = "0.2"
 lazy_static = "1.4"
-poem = {version = "^1.3.40", features = ["cookie", "session", "anyhow", "rustls", "websocket", "sse", "embed"]}
+poem = {version = "^1.3.42", features = ["cookie", "session", "anyhow", "rustls", "websocket", "sse", "embed"]}
 poem-openapi = {version = "^2.0.10", features = ["swagger-ui"]}
 reqwest = {version = "0.11", features = ["rustls-tls-native-roots", "stream"]}
 serde = "1.0"
diff --git a/warpgate-protocol-http/src/common.rs b/warpgate-protocol-http/src/common.rs
index caecc8a..256ad72 100644
--- a/warpgate-protocol-http/src/common.rs
+++ b/warpgate-protocol-http/src/common.rs
@@ -146,7 +146,7 @@ pub async fn _inner_auth<E: Endpoint + 'static>(
     })
 }
 
-pub fn endpoint_auth<E: Endpoint + 'static>(e: E) -> impl Endpoint {
+pub fn endpoint_auth<E: Endpoint + 'static>(e: E) -> impl Endpoint<Output = E::Output> {
     e.around(|ep, req| async move {
         _inner_auth(ep, req)
             .await?
diff --git a/warpgate-web/src/admin/lib/openapi-schema.json b/warpgate-web/src/admin/lib/openapi-schema.json
index 86ad59d..a70c5f7 100644
--- a/warpgate-web/src/admin/lib/openapi-schema.json
+++ b/warpgate-web/src/admin/lib/openapi-schema.json
@@ -2,7 +2,7 @@
   "openapi": "3.0.0",
   "info": {
     "title": "Warpgate Web Admin",
-    "version": "0.5.0"
+    "version": "0.6.1"
   },
   "servers": [
     {
@@ -22,7 +22,8 @@
             },
             "in": "query",
             "required": false,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           },
           {
             "name": "limit",
@@ -32,7 +33,8 @@
             },
             "in": "query",
             "required": false,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           },
           {
             "name": "active_only",
@@ -41,7 +43,8 @@
             },
             "in": "query",
             "required": false,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           },
           {
             "name": "logged_in_only",
@@ -50,7 +53,8 @@
             },
             "in": "query",
             "required": false,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -87,7 +91,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -119,7 +124,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -151,7 +157,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -176,7 +183,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -263,7 +271,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -293,7 +302,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "requestBody": {
@@ -336,7 +346,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -419,7 +430,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -449,7 +461,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "requestBody": {
@@ -492,7 +505,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -520,7 +534,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -555,7 +570,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           },
           {
             "name": "role_id",
@@ -565,7 +581,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -588,7 +605,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           },
           {
             "name": "role_id",
@@ -598,7 +616,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -681,7 +700,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -711,7 +731,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "requestBody": {
@@ -751,7 +772,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -776,7 +798,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -811,7 +834,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           },
           {
             "name": "role_id",
@@ -821,7 +845,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -844,7 +869,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           },
           {
             "name": "role_id",
@@ -854,7 +880,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -934,7 +961,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -979,7 +1007,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -1066,7 +1095,7 @@
         "enum": [
           "Password",
           "PublicKey",
-          "Otp",
+          "Totp",
           "Sso",
           "WebUserApproval"
         ]
diff --git a/warpgate-web/src/gateway/lib/openapi-schema.json b/warpgate-web/src/gateway/lib/openapi-schema.json
index 68b5c29..19d8244 100644
--- a/warpgate-web/src/gateway/lib/openapi-schema.json
+++ b/warpgate-web/src/gateway/lib/openapi-schema.json
@@ -2,7 +2,7 @@
   "openapi": "3.0.0",
   "info": {
     "title": "Warpgate HTTP proxy",
-    "version": "0.5.0"
+    "version": "0.6.1"
   },
   "servers": [
     {
@@ -112,7 +112,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -144,7 +145,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -176,7 +178,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -264,7 +267,8 @@
             },
             "in": "query",
             "required": false,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {
@@ -285,7 +289,8 @@
             },
             "in": "path",
             "required": true,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           },
           {
             "name": "next",
@@ -294,7 +299,8 @@
             },
             "in": "query",
             "required": false,
-            "deprecated": false
+            "deprecated": false,
+            "explode": true
           }
         ],
         "responses": {