diff --git a/Cargo.lock b/Cargo.lock
index 90a580b..f1d6478 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -128,6 +128,16 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
 
+[[package]]
+name = "async-attributes"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "async-channel"
 version = "1.6.1"
@@ -212,6 +222,7 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52580991739c5cdb36cde8b2a516371c0a3b70dda36d916cc08b82372916808c"
 dependencies = [
+ "async-attributes",
  "async-channel",
  "async-global-executor",
  "async-io",
@@ -312,7 +323,7 @@ dependencies = [
  "async-trait",
  "axum-core",
  "bitflags",
- "bytes 1.2.1",
+ "bytes",
  "futures-util",
  "http",
  "http-body",
@@ -339,7 +350,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3ddbd16eabff8b45f21b98671fddcc93daaa7ac4c84f8473693437226040de5"
 dependencies = [
  "async-trait",
- "bytes 1.2.1",
+ "bytes",
  "futures-util",
  "http",
  "http-body",
@@ -380,12 +391,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23ce669cd6c8588f79e15cf450314f9638f967fc5770ff1c7c1deb0925ea7cfa"
 
-[[package]]
-name = "base64"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7"
-
 [[package]]
 name = "base64"
 version = "0.13.0"
@@ -541,12 +546,6 @@ version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
-[[package]]
-name = "bytes"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
-
 [[package]]
 name = "bytes"
 version = "1.2.1"
@@ -783,7 +782,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "344adc371239ef32293cb1c4fe519592fcf21206c79c02854320afcdf3ab4917"
 dependencies = [
  "aes-gcm",
- "base64 0.13.0",
+ "base64",
  "hkdf",
  "hmac",
  "percent-encoding",
@@ -1469,7 +1468,7 @@ version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
 dependencies = [
- "bytes 1.2.1",
+ "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
@@ -1506,7 +1505,7 @@ version = "7.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "31672b7011be2c4f7456c4ddbcb40e7e9a4a9fad8efe49a6ebaf5f307d0109c0"
 dependencies = [
- "base64 0.13.0",
+ "base64",
  "byteorder",
  "flate2",
  "nom",
@@ -1519,9 +1518,9 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cff78e5788be1e0ab65b04d306b2ed5092c815ec97ec70f4ebd5aee158aa55d"
 dependencies = [
- "base64 0.13.0",
+ "base64",
  "bitflags",
- "bytes 1.2.1",
+ "bytes",
  "headers-core",
  "http",
  "httpdate",
@@ -1601,7 +1600,7 @@ version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
 dependencies = [
- "bytes 1.2.1",
+ "bytes",
  "fnv",
  "itoa",
 ]
@@ -1612,7 +1611,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6"
 dependencies = [
- "bytes 1.2.1",
+ "bytes",
  "http",
  "pin-project-lite",
 ]
@@ -1666,7 +1665,7 @@ version = "0.14.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2"
 dependencies = [
- "bytes 1.2.1",
+ "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
@@ -1715,7 +1714,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
- "bytes 1.2.1",
+ "bytes",
  "hyper",
  "native-tls",
  "tokio",
@@ -2120,7 +2119,7 @@ version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f8f35e687561d5c1667590911e6698a8cb714a134a7505718a182e7bc9d3836"
 dependencies = [
- "bytes 1.2.1",
+ "bytes",
  "encoding_rs",
  "futures-util",
  "http",
@@ -2139,13 +2138,13 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20ce6fdcef94a8e87fea3f9402de4d7e403f10e8c20b6e2bd207e6b6f8a4eab0"
 dependencies = [
- "base64 0.13.0",
+ "base64",
  "bigdecimal",
  "bindgen",
  "bitflags",
  "bitvec",
  "byteorder",
- "bytes 1.2.1",
+ "bytes",
  "cc",
  "cmake",
  "crc32fast",
@@ -2310,7 +2309,7 @@ version = "4.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d62c436394991641b970a92e23e8eeb4eb9bca74af4f5badc53bcd568daadbd"
 dependencies = [
- "base64 0.13.0",
+ "base64",
  "chrono",
  "getrandom 0.2.6",
  "http",
@@ -2351,7 +2350,7 @@ version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e26afc60b2bf11b9a039db1f3a3c0d5fe201eebdbe646a8ecb8342c8240e3271"
 dependencies = [
- "base64 0.13.0",
+ "base64",
  "chrono",
  "http",
  "itertools",
@@ -2587,7 +2586,7 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947"
 dependencies = [
- "base64 0.13.0",
+ "base64",
 ]
 
 [[package]]
@@ -2685,14 +2684,14 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
 
 [[package]]
 name = "poem"
-version = "1.3.42"
+version = "1.3.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4216504241ea26ae80929e341c5b1b6641c324a3ba99c22ea8f4b961a789e04"
+checksum = "260f16c6c484d4a3920efc81df282a529381fd3e4f35b19e6a9e7181a5990478"
 dependencies = [
  "anyhow",
  "async-trait",
- "base64 0.13.0",
- "bytes 1.2.1",
+ "base64",
+ "bytes",
  "chrono",
  "cookie",
  "futures-util",
@@ -2709,6 +2708,7 @@ dependencies = [
  "pin-project-lite",
  "poem-derive",
  "priority-queue",
+ "quick-xml 0.25.0",
  "rand 0.8.5",
  "regex",
  "rfc7239",
@@ -2727,14 +2727,13 @@ dependencies = [
  "tokio-tungstenite",
  "tokio-util",
  "tracing",
- "typed-headers",
 ]
 
 [[package]]
 name = "poem-derive"
-version = "1.3.42"
+version = "1.3.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9d9ed7ff541340cbbc168a1beb6a34ac08a8956b3f670413f461abaa946b6e"
+checksum = "d372ab8ac89eec1c2551f04bf15b021c41fbb66d0920bd42772da802cf891413"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -2744,12 +2743,12 @@ dependencies = [
 
 [[package]]
 name = "poem-openapi"
-version = "2.0.10"
+version = "2.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4d9252b377035ab2ef8d88020d0484f80892ec6325028af9e4c5839a0656b7"
+checksum = "e68158d48bdd60ac602f0c208d883968c649f129490db8aa53d8c1b6d23a2413"
 dependencies = [
- "base64 0.13.0",
- "bytes 1.2.1",
+ "base64",
+ "bytes",
  "chrono",
  "derive_more",
  "futures-util",
@@ -2757,6 +2756,7 @@ dependencies = [
  "num-traits",
  "poem",
  "poem-openapi-derive",
+ "quick-xml 0.23.1",
  "regex",
  "serde",
  "serde_json",
@@ -2769,9 +2769,9 @@ dependencies = [
 
 [[package]]
 name = "poem-openapi-derive"
-version = "2.0.12"
+version = "2.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "355883e212306f10203d9eb9046b64c890671b0013403d0893dcfa8419979cab"
+checksum = "e0609f742c168bf91759a1558d4c2d2d279cfa856e39f2b24d12e1f95f998d2f"
 dependencies = [
  "darling",
  "http",
@@ -2892,7 +2892,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7"
 dependencies = [
- "bytes 1.2.1",
+ "bytes",
  "prost-derive",
 ]
 
@@ -2915,10 +2915,30 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e"
 dependencies = [
- "bytes 1.2.1",
+ "bytes",
  "prost",
 ]
 
+[[package]]
+name = "quick-xml"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
+[[package]]
+name = "quick-xml"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58e21a144a0ffb5fad7b464babcdab934a325ad69b7c0373bcfef5cbd9799ca9"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.18"
@@ -3079,8 +3099,8 @@ version = "0.11.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92"
 dependencies = [
- "base64 0.13.0",
- "bytes 1.2.1",
+ "base64",
+ "bytes",
  "encoding_rs",
  "futures-core",
  "futures-util",
@@ -3339,7 +3359,7 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55"
 dependencies = [
- "base64 0.13.0",
+ "base64",
 ]
 
 [[package]]
@@ -3429,6 +3449,22 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "sea-orm-cli"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "882af0d4cd3d6cc2f427d14a48e9f468b37c563b405ea486fd314ba18ca334d0"
+dependencies = [
+ "chrono",
+ "clap",
+ "dotenvy",
+ "regex",
+ "sea-schema",
+ "tracing",
+ "tracing-subscriber",
+ "url",
+]
+
 [[package]]
 name = "sea-orm-macros"
 version = "0.10.2"
@@ -3449,7 +3485,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86fe6e594b078712e1e797b951b9b56e55d3cfa04aac8ea76eb4bed7c94c5910"
 dependencies = [
  "async-trait",
+ "clap",
+ "dotenvy",
  "sea-orm",
+ "sea-orm-cli",
  "sea-schema",
  "tracing",
  "tracing-subscriber",
@@ -3812,10 +3851,10 @@ checksum = "dcbc16ddba161afc99e14d1713a453747a2b07fc097d2009f4c300ec99286105"
 dependencies = [
  "ahash",
  "atoi",
- "base64 0.13.0",
+ "base64",
  "bitflags",
  "byteorder",
- "bytes 1.2.1",
+ "bytes",
  "chrono",
  "crc",
  "crossbeam-queue",
@@ -4100,7 +4139,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581"
 dependencies = [
  "autocfg",
- "bytes 1.2.1",
+ "bytes",
  "libc",
  "memchr",
  "mio",
@@ -4189,7 +4228,7 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764"
 dependencies = [
- "bytes 1.2.1",
+ "bytes",
  "futures-core",
  "futures-sink",
  "pin-project-lite",
@@ -4215,8 +4254,8 @@ dependencies = [
  "async-stream",
  "async-trait",
  "axum",
- "base64 0.13.0",
- "bytes 1.2.1",
+ "base64",
+ "bytes",
  "futures-core",
  "futures-util",
  "h2",
@@ -4280,7 +4319,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aba3f3efabf7fb41fae8534fc20a817013dd1c12cb45441efb6c82e6556b4cd8"
 dependencies = [
  "bitflags",
- "bytes 1.2.1",
+ "bytes",
  "futures-core",
  "futures-util",
  "http",
@@ -4390,9 +4429,9 @@ version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0"
 dependencies = [
- "base64 0.13.0",
+ "base64",
  "byteorder",
- "bytes 1.2.1",
+ "bytes",
  "http",
  "httparse",
  "log",
@@ -4405,19 +4444,6 @@ dependencies = [
  "webpki",
 ]
 
-[[package]]
-name = "typed-headers"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3179a61e9eccceead5f1574fd173cf2e162ac42638b9bf214c6ad0baf7efa24a"
-dependencies = [
- "base64 0.11.0",
- "bytes 0.5.6",
- "chrono",
- "http",
- "mime",
-]
-
 [[package]]
 name = "typenum"
 version = "1.15.0"
@@ -4607,7 +4633,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "atty",
- "bytes 1.2.1",
+ "bytes",
  "clap",
  "config",
  "console",
@@ -4642,7 +4668,7 @@ version = "0.6.4"
 dependencies = [
  "anyhow",
  "async-trait",
- "bytes 1.2.1",
+ "bytes",
  "chrono",
  "futures",
  "hex",
@@ -4672,7 +4698,7 @@ dependencies = [
  "anyhow",
  "argon2",
  "async-trait",
- "bytes 1.2.1",
+ "bytes",
  "chrono",
  "data-encoding",
  "delegate",
@@ -4708,7 +4734,7 @@ dependencies = [
  "anyhow",
  "argon2",
  "async-trait",
- "bytes 1.2.1",
+ "bytes",
  "chrono",
  "data-encoding",
  "futures",
@@ -4746,7 +4772,7 @@ name = "warpgate-database-protocols"
 version = "0.6.4"
 dependencies = [
  "bitflags",
- "bytes 1.2.1",
+ "bytes",
  "futures-core",
  "futures-util",
  "memchr",
@@ -4817,7 +4843,7 @@ version = "0.6.4"
 dependencies = [
  "anyhow",
  "async-trait",
- "bytes 1.2.1",
+ "bytes",
  "mysql_common",
  "once_cell",
  "password-hash 0.2.3",
@@ -4846,7 +4872,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "bimap",
- "bytes 1.2.1",
+ "bytes",
  "dialoguer",
  "futures",
  "russh",
@@ -4867,7 +4893,7 @@ dependencies = [
 name = "warpgate-sso"
 version = "0.6.4"
 dependencies = [
- "bytes 1.2.1",
+ "bytes",
  "once_cell",
  "openidconnect",
  "serde",
diff --git a/warpgate-admin/Cargo.toml b/warpgate-admin/Cargo.toml
index 2cf8f30..6330745 100644
--- a/warpgate-admin/Cargo.toml
+++ b/warpgate-admin/Cargo.toml
@@ -12,13 +12,13 @@ chrono = "0.4"
 futures = "0.3"
 hex = "0.4"
 mime_guess = { version = "2.0", default_features = false }
-poem = { version = "^1.3.42", features = [
+poem = { version = "1.3.48", features = [
     "cookie",
     "session",
     "anyhow",
     "websocket",
 ] }
-poem-openapi = { version = "^2.0.10", features = [
+poem-openapi = { version = "2.0.19", features = [
     "swagger-ui",
     "chrono",
     "uuid",
diff --git a/warpgate-common/Cargo.toml b/warpgate-common/Cargo.toml
index 070b48e..2651a58 100644
--- a/warpgate-common/Cargo.toml
+++ b/warpgate-common/Cargo.toml
@@ -16,8 +16,8 @@ humantime-serde = "1.1"
 futures = "0.3"
 once_cell = "1.14"
 password-hash = "0.4"
-poem = { version = "^1.3.42", features = ["rustls"] }
-poem-openapi = { version = "^2.0.10", features = [
+poem = { version = "1.3.48", features = ["rustls"] }
+poem-openapi = { version = "2.0.19", features = [
     "swagger-ui",
     "chrono",
     "uuid",
diff --git a/warpgate-core/Cargo.toml b/warpgate-core/Cargo.toml
index 843695d..4869416 100644
--- a/warpgate-core/Cargo.toml
+++ b/warpgate-core/Cargo.toml
@@ -20,8 +20,8 @@ futures = "0.3"
 once_cell = "1.14"
 packet = "0.1"
 password-hash = "0.4"
-poem = { version = "^1.3.42", features = ["rustls"] }
-poem-openapi = { version = "^2.0.10", features = [
+poem = { version = "1.3.48", features = ["rustls"] }
+poem-openapi = { version = "2.0.19", features = [
     "swagger-ui",
     "chrono",
     "uuid",
diff --git a/warpgate-db-entities/Cargo.toml b/warpgate-db-entities/Cargo.toml
index 00cbc61..1ba8811 100644
--- a/warpgate-db-entities/Cargo.toml
+++ b/warpgate-db-entities/Cargo.toml
@@ -6,7 +6,7 @@ version = "0.6.4"
 
 [dependencies]
 chrono = { version = "0.4", features = ["serde"] }
-poem-openapi = { version = "^2.0.10", features = ["chrono", "uuid"] }
+poem-openapi = { version = "2.0.19", features = ["chrono", "uuid"] }
 sea-orm = { version = "0.10.2", features = [
     "macros",
     "with-chrono",
diff --git a/warpgate-db-migrations/Cargo.toml b/warpgate-db-migrations/Cargo.toml
index c2a2544..ffd7ed7 100644
--- a/warpgate-db-migrations/Cargo.toml
+++ b/warpgate-db-migrations/Cargo.toml
@@ -8,7 +8,7 @@ version = "0.6.4"
 [lib]
 
 [dependencies]
-async-std = "^1.11"
+async-std = { version = "^1.11", features = ["attributes"] }
 chrono = "0.4"
 sea-orm = { version = "0.10.2", features = [
     "runtime-tokio-native-tls",
@@ -17,6 +17,8 @@ sea-orm = { version = "0.10.2", features = [
     "with-uuid",
     "with-json",
 ], default-features = false }
-sea-orm-migration = { version = "0.10.2", default-features = false }
+sea-orm-migration = { version = "0.10.2", default-features = false, features = [
+    "cli",
+] }
 uuid = { version = "1.0", features = ["v4", "serde"] }
 serde_json = "1.0"
diff --git a/warpgate-protocol-http/Cargo.toml b/warpgate-protocol-http/Cargo.toml
index 7b5d826..8f4cc92 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"
 once_cell = "1.14"
-poem = { version = "^1.3.42", features = [
+poem = { version = "^1.3.48", features = [
     "cookie",
     "session",
     "anyhow",
@@ -23,7 +23,7 @@ poem = { version = "^1.3.42", features = [
     "sse",
     "embed",
 ] }
-poem-openapi = { version = "^2.0.10", features = ["swagger-ui"] }
+poem-openapi = { version = "2.0.19", features = ["swagger-ui"] }
 reqwest = { version = "0.11", features = ["rustls-tls-native-roots", "stream"] }
 serde = "1.0"
 serde_json = "1.0"
diff --git a/warpgate-web/src/admin/lib/openapi-schema.json b/warpgate-web/src/admin/lib/openapi-schema.json
index 1c9e8d4..baf937e 100644
--- a/warpgate-web/src/admin/lib/openapi-schema.json
+++ b/warpgate-web/src/admin/lib/openapi-schema.json
@@ -61,7 +61,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/PaginatedSessionSnapshot"
                 }
@@ -99,7 +99,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/SessionSnapshot"
                 }
@@ -132,7 +132,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "type": "array",
                   "items": {
@@ -191,7 +191,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/Recording"
                 }
@@ -211,7 +211,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "type": "array",
                   "items": {
@@ -227,7 +227,7 @@
       "post": {
         "requestBody": {
           "content": {
-            "application/json": {
+            "application/json; charset=utf-8": {
               "schema": {
                 "$ref": "#/components/schemas/RoleDataRequest"
               }
@@ -239,7 +239,7 @@
           "201": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/Role"
                 }
@@ -249,7 +249,7 @@
           "400": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "type": "string"
                 }
@@ -279,7 +279,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/Role"
                 }
@@ -308,7 +308,7 @@
         ],
         "requestBody": {
           "content": {
-            "application/json": {
+            "application/json; charset=utf-8": {
               "schema": {
                 "$ref": "#/components/schemas/RoleDataRequest"
               }
@@ -320,7 +320,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/Role"
                 }
@@ -370,7 +370,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "type": "array",
                   "items": {
@@ -386,7 +386,7 @@
       "post": {
         "requestBody": {
           "content": {
-            "application/json": {
+            "application/json; charset=utf-8": {
               "schema": {
                 "$ref": "#/components/schemas/TargetDataRequest"
               }
@@ -398,7 +398,7 @@
           "201": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/Target"
                 }
@@ -408,7 +408,7 @@
           "400": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "type": "string"
                 }
@@ -438,7 +438,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/Target"
                 }
@@ -467,7 +467,7 @@
         ],
         "requestBody": {
           "content": {
-            "application/json": {
+            "application/json; charset=utf-8": {
               "schema": {
                 "$ref": "#/components/schemas/TargetDataRequest"
               }
@@ -479,7 +479,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/Target"
                 }
@@ -542,7 +542,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "type": "array",
                   "items": {
@@ -640,7 +640,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "type": "array",
                   "items": {
@@ -656,7 +656,7 @@
       "post": {
         "requestBody": {
           "content": {
-            "application/json": {
+            "application/json; charset=utf-8": {
               "schema": {
                 "$ref": "#/components/schemas/UserDataRequest"
               }
@@ -668,7 +668,7 @@
           "201": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/User"
                 }
@@ -678,7 +678,7 @@
           "400": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "type": "string"
                 }
@@ -708,7 +708,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/User"
                 }
@@ -737,7 +737,7 @@
         ],
         "requestBody": {
           "content": {
-            "application/json": {
+            "application/json; charset=utf-8": {
               "schema": {
                 "$ref": "#/components/schemas/UserDataRequest"
               }
@@ -749,7 +749,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/User"
                 }
@@ -806,7 +806,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "type": "array",
                   "items": {
@@ -901,7 +901,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "type": "array",
                   "items": {
@@ -917,7 +917,7 @@
       "post": {
         "requestBody": {
           "content": {
-            "application/json": {
+            "application/json; charset=utf-8": {
               "schema": {
                 "$ref": "#/components/schemas/CreateTicketRequest"
               }
@@ -929,7 +929,7 @@
           "201": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/TicketAndSecret"
                 }
@@ -939,7 +939,7 @@
           "400": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "type": "string"
                 }
@@ -982,7 +982,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "type": "array",
                   "items": {
@@ -1028,7 +1028,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "type": "array",
                   "items": {
@@ -1046,7 +1046,7 @@
       "post": {
         "requestBody": {
           "content": {
-            "application/json": {
+            "application/json; charset=utf-8": {
               "schema": {
                 "$ref": "#/components/schemas/GetLogsRequest"
               }
@@ -1058,7 +1058,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "type": "array",
                   "items": {
@@ -1284,7 +1284,7 @@
           },
           "port": {
             "type": "integer",
-            "format": "uint16"
+            "format": "int32"
           },
           "key_type": {
             "type": "string"
@@ -1642,7 +1642,7 @@
           },
           "uses_left": {
             "type": "integer",
-            "format": "uint32"
+            "format": "int32"
           },
           "expiry": {
             "type": "string",
diff --git a/warpgate-web/src/gateway/lib/openapi-schema.json b/warpgate-web/src/gateway/lib/openapi-schema.json
index c18c9de..e1d3558 100644
--- a/warpgate-web/src/gateway/lib/openapi-schema.json
+++ b/warpgate-web/src/gateway/lib/openapi-schema.json
@@ -15,7 +15,7 @@
       "post": {
         "requestBody": {
           "content": {
-            "application/json": {
+            "application/json; charset=utf-8": {
               "schema": {
                 "$ref": "#/components/schemas/LoginRequest"
               }
@@ -30,7 +30,7 @@
           "401": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/LoginFailureResponse"
                 }
@@ -45,7 +45,7 @@
       "post": {
         "requestBody": {
           "content": {
-            "application/json": {
+            "application/json; charset=utf-8": {
               "schema": {
                 "$ref": "#/components/schemas/OtpLoginRequest"
               }
@@ -60,7 +60,7 @@
           "401": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/LoginFailureResponse"
                 }
@@ -87,7 +87,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/AuthStateResponseInternal"
                 }
@@ -105,7 +105,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/AuthStateResponseInternal"
                 }
@@ -138,7 +138,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/AuthStateResponseInternal"
                 }
@@ -171,7 +171,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/AuthStateResponseInternal"
                 }
@@ -204,7 +204,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/AuthStateResponseInternal"
                 }
@@ -224,7 +224,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/Info"
                 }
@@ -241,7 +241,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "type": "array",
                   "items": {
@@ -261,7 +261,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "type": "array",
                   "items": {
@@ -295,6 +295,21 @@
           }
         },
         "operationId": "return_to_sso"
+      },
+      "post": {
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "text/html; charset=utf-8": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        },
+        "operationId": "return_to_sso_with_form_data"
       }
     },
     "/sso/providers/{name}/start": {
@@ -325,7 +340,7 @@
           "200": {
             "description": "",
             "content": {
-              "application/json": {
+              "application/json; charset=utf-8": {
                 "schema": {
                   "$ref": "#/components/schemas/StartSsoResponseParams"
                 }