diff --git a/api/lib/control/video-service.ts b/api/lib/control/video-service.ts
index 2121ffdc0..2cac67553 100644
--- a/api/lib/control/video-service.ts
+++ b/api/lib/control/video-service.ts
@@ -1,6 +1,7 @@
 import Err from '@openaddresses/batch-error';
 import Config from '../config.js';
 import { Type, Static } from '@sinclair/typebox';
+import { VideoLeaseResponse } from '../types.js';
 import fetch from '../fetch.js';
 
 export const VideoConfig = Type.Object({
@@ -18,12 +19,15 @@ export const VideoConfig = Type.Object({
 export const PathConfig = Type.Object({
     name: Type.String(),
     confName: Type.String(),
-    source: Type.Object({
-        id: Type.String(),
-        type: Type.String(),
-    }),
+    source: Type.Union([
+        Type.Object({
+            id: Type.String(),
+            type: Type.String(),
+        }),
+        Type.Null()
+    ]),
     ready: Type.Boolean(),
-    readyTime: Type.String(),
+    readyTime: Type.Union([Type.String(), Type.Null()]),
     tracks: Type.Array(Type.String()),
     bytesReceived: Type.Integer(),
     bytesSent: Type.Integer(),
@@ -53,17 +57,18 @@ export default class VideoServiceControl {
         this.config = config;
     }
 
-    async configuration(): Promise<Static<typeof Configuration>> {
-        let video;
-
-        const headers = new Headers();
+    async settings(): Promise<{
+        configured: boolean;
+        url?: string;
+        username?: string;
+        password?: string;
+    }> {
+        let video, user, pass;
 
         try {
             video = await this.config.models.Setting.from('media::url');
-            const user = await this.config.models.Setting.from('media::username');
-            const pass = await this.config.models.Setting.from('media::password');
-
-            headers.append('Authorization', `Basic ${Buffer.from(user.value + ':' + pass.value).toString('base64')}`);
+            user = await this.config.models.Setting.from('media::username');
+            pass = await this.config.models.Setting.from('media::password');
         } catch (err) {
             if (err.message.includes('Not Found')) {
                 return {
@@ -74,23 +79,105 @@ export default class VideoServiceControl {
             }
         }
 
-        const url = new URL('/v3/config/global/get', video.value);
+        return {
+            configured: true,
+            url: video.value,
+            username: user.value,
+            password: pass.value,
+        }
+    }
+
+    headers(username: string, password: string): Headers {
+        const headers = new Headers();
+        headers.append('Authorization', `Basic ${Buffer.from(username + ':' + password).toString('base64')}`);
+        return headers;
+    }
+
+    async configuration(): Promise<Static<typeof Configuration>> {
+        const video = await this.settings();
+        const headers = this.headers(video.username, video.password);
+
+        if (!video.configured) return video;
+
+        const url = new URL('/v3/config/global/get', video.url);
         url.port = '9997';
 
         const res = await fetch(url, { headers })
+        if (!res.ok) throw new Err(500, null, await res.text())
         const body = await res.typed(VideoConfig);
 
-        const urlPaths = new URL('/v3/paths/list', video.value);
+        const urlPaths = new URL('/v3/paths/list', video.url);
         urlPaths.port = '9997';
 
         const resPaths = await fetch(urlPaths, { headers })
+        if (!resPaths.ok) throw new Err(500, null, await resPaths.text())
+
         const paths = await resPaths.typed(PathsConfig);
 
         return {
-            configured: true,
-            url: video.value,
+            configured: video.configured,
+            url: video.url,
             config: body,
             paths: paths.items,
         };
     }
+
+    async generate(opts: {
+        name: string;
+        expiration: string;
+        path: string;
+        username: string;
+    }): Promise<Static<typeof VideoLeaseResponse>> {
+        const video = await this.settings();
+
+        if (!video.configured) throw new Err(400, null, 'Media Integration is not configured');
+
+        const headers = this.headers(video.username, video.password);
+
+        const lease = await this.config.models.VideoLease.generate({
+            name: opts.name,
+            expiration: opts.expiration,
+            path: opts.path,
+            username: opts.username
+        });
+
+        const url = new URL(`/v3/config/paths/add/${lease.path}`, video.url);
+        url.port = '9997';
+
+        headers.append('Content-Type', 'application/json');
+
+        const res = await fetch(url, {
+            method: 'POST',
+            headers,
+            body: JSON.stringify({
+                name: opts.path
+            }),
+        })
+
+        if (!res.ok) throw new Err(500, null, await res.text())
+
+        return lease;
+    }
+
+    async delete(leaseid: string): Promise<void> {
+        const video = await this.settings();
+
+        if (!video.configured) throw new Err(400, null, 'Media Integration is not configured');
+
+        const headers = this.headers(video.username, video.password);
+
+        const lease = await this.config.models.VideoLease.from(leaseid);
+
+        await this.config.models.VideoLease.delete(leaseid);
+
+        const url = new URL(`/v3/config/paths/delete/${lease.path}`, video.url);
+        url.port = '9997';
+
+        await fetch(url, {
+            method: 'DELETE',
+            headers,
+        })
+
+        return;
+    }
 }
diff --git a/api/routes/video-lease.ts b/api/routes/video-lease.ts
index 19e53ed6d..2c2059bb8 100644
--- a/api/routes/video-lease.ts
+++ b/api/routes/video-lease.ts
@@ -8,18 +8,21 @@ import { sql } from 'drizzle-orm';
 import { Token } from '../lib/schema.js';
 import { randomUUID } from 'node:crypto';
 import { StandardResponse, VideoLeaseResponse } from '../lib/types.js';
+import ECSVideoControl from '../lib/control/video-service.js';
 import * as Default from '../lib/limits.js';
 
 export default async function router(schema: Schema, config: Config) {
+    const videoControl = new ECSVideoControl(config);
+
     await schema.get('/video/lease', {
         name: 'List Leases',
         group: 'VideoLease',
-        description: 'List all vide',
+        description: 'List all video leases',
         query: Type.Object({
             limit: Default.Limit,
             page: Default.Page,
             order: Default.Order,
-            sort: Type.Optional(Type.String({default: 'created', enum: Object.keys(Token) })),
+            sort: Type.Optional(Type.String({ default: 'created', enum: Object.keys(Token) })),
             filter: Default.Filter
         }),
         res: Type.Object({
@@ -64,7 +67,7 @@ export default async function router(schema: Schema, config: Config) {
                 throw new Err(400, null, 'Only Administrators can request a lease > 16 hours')
             }
 
-            const lease = await config.models.VideoLease.generate({
+            const lease = await videoControl.generate({
                 name: req.body.name,
                 expiration: moment().add(req.body.duration, 'seconds').toISOString(),
                 path: randomUUID(),
@@ -90,12 +93,15 @@ export default async function router(schema: Schema, config: Config) {
             const user = await Auth.as_user(config, req);
 
             if (user.access === AuthUserAccess.ADMIN) {
-                await config.models.VideoLease.delete(req.params.lease);
+                await videoControl.delete(req.params.lease);
             } else {
-                await config.models.VideoLease.delete(sql`
-                    username = ${user.email}
-                    AND id = ${req.params.lease}
-                `);
+                const lease = await config.models.VideoLease.from(req.params.lease);
+
+                if (lease.username === user.email) {
+                    await videoControl.delete(req.params.lease);
+                } else {
+                    throw new Err(400, null, 'You can only delete a least you created');
+                }
             }
 
             return res.json({
diff --git a/api/web/package-lock.json b/api/web/package-lock.json
index fdbc02e2f..b8572ac6f 100644
--- a/api/web/package-lock.json
+++ b/api/web/package-lock.json
@@ -80,9 +80,9 @@
             }
         },
         "node_modules/@babel/compat-data": {
-            "version": "7.25.2",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.2.tgz",
-            "integrity": "sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
+            "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -140,13 +140,13 @@
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.25.0",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz",
-            "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.4.tgz",
+            "integrity": "sha512-NFtZmZsyzDPJnk9Zg3BbTfKKc9UlHYzD0E//p2Z3B9nCwwtJW9T0gVbCz8+fBngnn4zf1Dr3IK8PHQQHq0lDQw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.25.0",
+                "@babel/types": "^7.25.4",
                 "@jridgewell/gen-mapping": "^0.3.5",
                 "@jridgewell/trace-mapping": "^0.3.25",
                 "jsesc": "^2.5.1"
@@ -200,9 +200,9 @@
             }
         },
         "node_modules/@babel/helper-create-class-features-plugin": {
-            "version": "7.25.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.0.tgz",
-            "integrity": "sha512-GYM6BxeQsETc9mnct+nIIpf63SAyzvyYN7UB/IlTyd+MBg06afFGp0mIeUqGyWgS2mxad6vqbMrHVlaL3m70sQ==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz",
+            "integrity": "sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -211,7 +211,7 @@
                 "@babel/helper-optimise-call-expression": "^7.24.7",
                 "@babel/helper-replace-supers": "^7.25.0",
                 "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-                "@babel/traverse": "^7.25.0",
+                "@babel/traverse": "^7.25.4",
                 "semver": "^6.3.1"
             },
             "engines": {
@@ -464,12 +464,12 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.25.3",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.3.tgz",
-            "integrity": "sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.4.tgz",
+            "integrity": "sha512-nq+eWrOgdtu3jG5Os4TQP3x3cLA8hR8TvJNjD8vnPa20WGycimcparWnLK4jJhElTK6SDyuJo1weMKO/5LpmLA==",
             "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.25.2"
+                "@babel/types": "^7.25.4"
             },
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -845,16 +845,16 @@
             }
         },
         "node_modules/@babel/plugin-transform-async-generator-functions": {
-            "version": "7.25.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.0.tgz",
-            "integrity": "sha512-uaIi2FdqzjpAMvVqvB51S42oC2JEVgh0LDsGfZVDysWE8LrJtQC2jvKmOqEYThKyB7bDEb7BP1GYWDm7tABA0Q==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.4.tgz",
+            "integrity": "sha512-jz8cV2XDDTqjKPwVPJBIjORVEmSGYhdRa8e5k5+vN+uwcjSrSxUaebBRa4ko1jqNF2uxyg8G6XYk30Jv285xzg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/helper-plugin-utils": "^7.24.8",
                 "@babel/helper-remap-async-to-generator": "^7.25.0",
                 "@babel/plugin-syntax-async-generators": "^7.8.4",
-                "@babel/traverse": "^7.25.0"
+                "@babel/traverse": "^7.25.4"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -914,14 +914,14 @@
             }
         },
         "node_modules/@babel/plugin-transform-class-properties": {
-            "version": "7.24.7",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz",
-            "integrity": "sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.4.tgz",
+            "integrity": "sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-create-class-features-plugin": "^7.24.7",
-                "@babel/helper-plugin-utils": "^7.24.7"
+                "@babel/helper-create-class-features-plugin": "^7.25.4",
+                "@babel/helper-plugin-utils": "^7.24.8"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -949,17 +949,17 @@
             }
         },
         "node_modules/@babel/plugin-transform-classes": {
-            "version": "7.25.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.0.tgz",
-            "integrity": "sha512-xyi6qjr/fYU304fiRwFbekzkqVJZ6A7hOjWZd+89FVcBqPV3S9Wuozz82xdpLspckeaafntbzglaW4pqpzvtSw==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz",
+            "integrity": "sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/helper-annotate-as-pure": "^7.24.7",
-                "@babel/helper-compilation-targets": "^7.24.8",
+                "@babel/helper-compilation-targets": "^7.25.2",
                 "@babel/helper-plugin-utils": "^7.24.8",
                 "@babel/helper-replace-supers": "^7.25.0",
-                "@babel/traverse": "^7.25.0",
+                "@babel/traverse": "^7.25.4",
                 "globals": "^11.1.0"
             },
             "engines": {
@@ -1430,14 +1430,14 @@
             }
         },
         "node_modules/@babel/plugin-transform-private-methods": {
-            "version": "7.24.7",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz",
-            "integrity": "sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.4.tgz",
+            "integrity": "sha512-ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-create-class-features-plugin": "^7.24.7",
-                "@babel/helper-plugin-utils": "^7.24.7"
+                "@babel/helper-create-class-features-plugin": "^7.25.4",
+                "@babel/helper-plugin-utils": "^7.24.8"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1646,14 +1646,14 @@
             }
         },
         "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-            "version": "7.24.7",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz",
-            "integrity": "sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.4.tgz",
+            "integrity": "sha512-qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-                "@babel/helper-plugin-utils": "^7.24.7"
+                "@babel/helper-create-regexp-features-plugin": "^7.25.2",
+                "@babel/helper-plugin-utils": "^7.24.8"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1663,13 +1663,13 @@
             }
         },
         "node_modules/@babel/preset-env": {
-            "version": "7.25.3",
-            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.3.tgz",
-            "integrity": "sha512-QsYW7UeAaXvLPX9tdVliMJE7MD7M6MLYVTovRTIwhoYQVFHR1rM4wO8wqAezYi3/BpSD+NzVCZ69R6smWiIi8g==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.4.tgz",
+            "integrity": "sha512-W9Gyo+KmcxjGahtt3t9fb14vFRWvPpu5pT6GBlovAK6BTBcxgjfVMSQCfJl4oi35ODrxP6xx2Wr8LNST57Mraw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/compat-data": "^7.25.2",
+                "@babel/compat-data": "^7.25.4",
                 "@babel/helper-compilation-targets": "^7.25.2",
                 "@babel/helper-plugin-utils": "^7.24.8",
                 "@babel/helper-validator-option": "^7.24.8",
@@ -1698,13 +1698,13 @@
                 "@babel/plugin-syntax-top-level-await": "^7.14.5",
                 "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
                 "@babel/plugin-transform-arrow-functions": "^7.24.7",
-                "@babel/plugin-transform-async-generator-functions": "^7.25.0",
+                "@babel/plugin-transform-async-generator-functions": "^7.25.4",
                 "@babel/plugin-transform-async-to-generator": "^7.24.7",
                 "@babel/plugin-transform-block-scoped-functions": "^7.24.7",
                 "@babel/plugin-transform-block-scoping": "^7.25.0",
-                "@babel/plugin-transform-class-properties": "^7.24.7",
+                "@babel/plugin-transform-class-properties": "^7.25.4",
                 "@babel/plugin-transform-class-static-block": "^7.24.7",
-                "@babel/plugin-transform-classes": "^7.25.0",
+                "@babel/plugin-transform-classes": "^7.25.4",
                 "@babel/plugin-transform-computed-properties": "^7.24.7",
                 "@babel/plugin-transform-destructuring": "^7.24.8",
                 "@babel/plugin-transform-dotall-regex": "^7.24.7",
@@ -1732,7 +1732,7 @@
                 "@babel/plugin-transform-optional-catch-binding": "^7.24.7",
                 "@babel/plugin-transform-optional-chaining": "^7.24.8",
                 "@babel/plugin-transform-parameters": "^7.24.7",
-                "@babel/plugin-transform-private-methods": "^7.24.7",
+                "@babel/plugin-transform-private-methods": "^7.25.4",
                 "@babel/plugin-transform-private-property-in-object": "^7.24.7",
                 "@babel/plugin-transform-property-literals": "^7.24.7",
                 "@babel/plugin-transform-regenerator": "^7.24.7",
@@ -1745,10 +1745,10 @@
                 "@babel/plugin-transform-unicode-escapes": "^7.24.7",
                 "@babel/plugin-transform-unicode-property-regex": "^7.24.7",
                 "@babel/plugin-transform-unicode-regex": "^7.24.7",
-                "@babel/plugin-transform-unicode-sets-regex": "^7.24.7",
+                "@babel/plugin-transform-unicode-sets-regex": "^7.25.4",
                 "@babel/preset-modules": "0.1.6-no-external-plugins",
                 "babel-plugin-polyfill-corejs2": "^0.4.10",
-                "babel-plugin-polyfill-corejs3": "^0.10.4",
+                "babel-plugin-polyfill-corejs3": "^0.10.6",
                 "babel-plugin-polyfill-regenerator": "^0.6.1",
                 "core-js-compat": "^3.37.1",
                 "semver": "^6.3.1"
@@ -1783,9 +1783,9 @@
             "license": "MIT"
         },
         "node_modules/@babel/runtime": {
-            "version": "7.25.0",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.0.tgz",
-            "integrity": "sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.4.tgz",
+            "integrity": "sha512-DSgLeL/FNcpXuzav5wfYvHCGvynXkJbn3Zvc3823AEe9nPwW9IK4UoCSS5yGymmQzN0pCPvivtgS6/8U2kkm1w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1811,17 +1811,17 @@
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.25.3",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.3.tgz",
-            "integrity": "sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.4.tgz",
+            "integrity": "sha512-VJ4XsrD+nOvlXyLzmLzUs/0qjFS4sK30te5yEFlvbbUNEgKaVb2BHZUpAL+ttLPQAHNrsI3zZisbfha5Cvr8vg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/code-frame": "^7.24.7",
-                "@babel/generator": "^7.25.0",
-                "@babel/parser": "^7.25.3",
+                "@babel/generator": "^7.25.4",
+                "@babel/parser": "^7.25.4",
                 "@babel/template": "^7.25.0",
-                "@babel/types": "^7.25.2",
+                "@babel/types": "^7.25.4",
                 "debug": "^4.3.1",
                 "globals": "^11.1.0"
             },
@@ -1830,9 +1830,9 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.25.2",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.2.tgz",
-            "integrity": "sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.4.tgz",
+            "integrity": "sha512-zQ1ijeeCXVEh+aNL0RlmkPkG8HUiDcU2pzQQFjtbntgAczRASFzj4H+6+bV+dy1ntKR14I/DypeuRG1uma98iQ==",
             "license": "MIT",
             "dependencies": {
                 "@babel/helper-string-parser": "^7.24.8",
@@ -2693,9 +2693,9 @@
             "license": "MIT"
         },
         "node_modules/@redocly/openapi-core": {
-            "version": "1.20.0",
-            "resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.20.0.tgz",
-            "integrity": "sha512-3QdXCiGFwG1iyUHcQXYkC1kdf+Klss2Sd4ILss8GVVOOUhjUmblzq6g+1Eq/DIXCQRmLktJG6H9/Oe6gEnQ0OA==",
+            "version": "1.20.1",
+            "resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.20.1.tgz",
+            "integrity": "sha512-ZbIJRelAAkXuOnKgEyAuzS2Th24ZY4qnJY62ddbAaAn6NworI6BrnoMq/MqkilQWBKhbVTy/XeXc9jWDXLwkRA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -5664,29 +5664,41 @@
             }
         },
         "node_modules/global-prefix": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-            "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-4.0.0.tgz",
+            "integrity": "sha512-w0Uf9Y9/nyHinEk5vMJKRie+wa4kR5hmDbEhGGds/kG1PwGLLHKRoNMeJOyCQjjBkANlnScqgzcFwGHgmgLkVA==",
             "license": "MIT",
             "dependencies": {
-                "ini": "^1.3.5",
-                "kind-of": "^6.0.2",
-                "which": "^1.3.1"
+                "ini": "^4.1.3",
+                "kind-of": "^6.0.3",
+                "which": "^4.0.0"
             },
             "engines": {
-                "node": ">=6"
+                "node": ">=16"
+            }
+        },
+        "node_modules/global-prefix/node_modules/isexe": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz",
+            "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==",
+            "license": "ISC",
+            "engines": {
+                "node": ">=16"
             }
         },
         "node_modules/global-prefix/node_modules/which": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-            "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
+            "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==",
             "license": "ISC",
             "dependencies": {
-                "isexe": "^2.0.0"
+                "isexe": "^3.1.1"
             },
             "bin": {
-                "which": "bin/which"
+                "node-which": "bin/which.js"
+            },
+            "engines": {
+                "node": "^16.13.0 || >=18.0.0"
             }
         },
         "node_modules/globals": {
@@ -5958,10 +5970,13 @@
             "license": "ISC"
         },
         "node_modules/ini": {
-            "version": "1.3.8",
-            "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-            "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-            "license": "ISC"
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz",
+            "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==",
+            "license": "ISC",
+            "engines": {
+                "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+            }
         },
         "node_modules/internal-slot": {
             "version": "1.0.7",
@@ -6067,9 +6082,9 @@
             }
         },
         "node_modules/is-core-module": {
-            "version": "2.15.0",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz",
-            "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==",
+            "version": "2.15.1",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+            "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -6359,6 +6374,7 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
             "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+            "dev": true,
             "license": "ISC"
         },
         "node_modules/isobject": {
@@ -6729,9 +6745,9 @@
             }
         },
         "node_modules/maplibre-gl": {
-            "version": "4.5.2",
-            "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.5.2.tgz",
-            "integrity": "sha512-vlWL9EY2bSGg5FAt0mKPfYqlfX15uLW5D3kKv4Xjn54nIVn01MKdfUJMAVIr+8fXVqfSX6c095Iy5XnV+T76kQ==",
+            "version": "4.6.0",
+            "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.6.0.tgz",
+            "integrity": "sha512-zobZK+fE+XM+7K81fk5pSBYWZlTGjGT0P96y2fR4DV2ry35ZBfAd0uWNatll69EgYeE+uOhN1MvEk+z1PCuyOQ==",
             "license": "BSD-3-Clause",
             "dependencies": {
                 "@mapbox/geojson-rewind": "^0.5.2",
@@ -6741,7 +6757,7 @@
                 "@mapbox/unitbezier": "^0.0.1",
                 "@mapbox/vector-tile": "^1.3.1",
                 "@mapbox/whoots-js": "^3.1.0",
-                "@maplibre/maplibre-gl-style-spec": "^20.3.0",
+                "@maplibre/maplibre-gl-style-spec": "^20.3.1",
                 "@types/geojson": "^7946.0.14",
                 "@types/geojson-vt": "3.2.5",
                 "@types/mapbox__point-geometry": "^0.1.4",
@@ -6751,7 +6767,7 @@
                 "earcut": "^3.0.0",
                 "geojson-vt": "^4.0.2",
                 "gl-matrix": "^3.4.3",
-                "global-prefix": "^3.0.0",
+                "global-prefix": "^4.0.0",
                 "kdbush": "^4.0.2",
                 "murmurhash-js": "^1.0.0",
                 "pbf": "^3.3.0",
diff --git a/api/web/src/components/Admin/AdminUser.vue b/api/web/src/components/Admin/AdminUser.vue
index 252d12d30..5652bad7f 100644
--- a/api/web/src/components/Admin/AdminUser.vue
+++ b/api/web/src/components/Admin/AdminUser.vue
@@ -36,10 +36,25 @@
                                 class='datagrid-title'
                                 v-text='ele'
                             />
-                            <div
-                                class='datagrid-content'
-                                v-text='user[ele]'
-                            />
+
+                            <template v-if='ele === "tak_loc"'>
+                                <div
+                                    class='datagrid-content'
+                                    v-text='user.tak_loc ? user.tak_loc.coordinates.join(",") : "Unset"'
+                                />
+                            </template>
+                            <template v-else-if='ele === "agency_admin"'>
+                                <div
+                                    class='datagrid-content'
+                                    v-text='user.agency_admin.length ? user.agency_admin : "None"'
+                                />
+                            </template>
+                            <template v-else>
+                                <div
+                                    class='datagrid-content'
+                                    v-text='user[ele]'
+                                />
+                            </template>
                         </div>
                     </template>
                 </div>
diff --git a/api/web/src/components/Admin/VideoConfig.vue b/api/web/src/components/Admin/VideoConfig.vue
index 74f330b8f..17c9e3631 100644
--- a/api/web/src/components/Admin/VideoConfig.vue
+++ b/api/web/src/components/Admin/VideoConfig.vue
@@ -1,58 +1,60 @@
 <template>
-    <div class='col-12 px-2 py-2 row g-2'>
-        <TablerToggle
-            v-model='config.api'
-            :disabled='disabled'
-            label='MediaMTX API Enabled'
-        />
+    <div class='col-12 py-2 g-2'>
+        <div class='row g-0'>
+            <TablerToggle
+                v-model='config.api'
+                :disabled='disabled'
+                label='Config API Enabled'
+            />
 
-        <TablerToggle
-            v-model='config.metrics'
-            :disabled='disabled'
-            label='MediaMTX Metrics Enabled'
-        />
+            <TablerToggle
+                v-model='config.metrics'
+                :disabled='disabled'
+                label='Metrics Enabled'
+            />
 
-        <TablerToggle
-            v-model='config.pprof'
-            :disabled='disabled'
-            label='Performance Metrics Enabled'
-        />
+            <TablerToggle
+                v-model='config.pprof'
+                :disabled='disabled'
+                label='Performance Metrics Enabled'
+            />
 
-        <TablerToggle
-            v-model='config.playback'
-            :disabled='disabled'
-            label='Playback API Enabled'
-        />
+            <TablerToggle
+                v-model='config.playback'
+                :disabled='disabled'
+                label='Playback API Enabled'
+            />
 
-        <TablerToggle
-            v-model='config.rtsp'
-            :disabled='disabled'
-            label='RTSP Endpoint Enabled'
-        />
+            <TablerToggle
+                v-model='config.rtsp'
+                :disabled='disabled'
+                label='RTSP Endpoint Enabled'
+            />
 
-        <TablerToggle
-            v-model='config.rtmp'
-            :disabled='disabled'
-            label='RTMP Endpoint Enabled'
-        />
+            <TablerToggle
+                v-model='config.rtmp'
+                :disabled='disabled'
+                label='RTMP Endpoint Enabled'
+            />
 
-        <TablerToggle
-            v-model='config.hls'
-            :disabled='disabled'
-            label='HLS Endpoint Enabled'
-        />
+            <TablerToggle
+                v-model='config.hls'
+                :disabled='disabled'
+                label='HLS Endpoint Enabled'
+            />
 
-        <TablerToggle
-            v-model='config.webrtc'
-            :disabled='disabled'
-            label='WebRTC Endpoint Enabled'
-        />
+            <TablerToggle
+                v-model='config.webrtc'
+                :disabled='disabled'
+                label='WebRTC Endpoint Enabled'
+            />
 
-        <TablerToggle
-            v-model='config.srt'
-            :disabled='disabled'
-            label='SRT Endpoint Enabled'
-        />
+            <TablerToggle
+                v-model='config.srt'
+                :disabled='disabled'
+                label='SRT Endpoint Enabled'
+            />
+        </div>
 
 
         <label class='subheader mx-2'>Server Paths</label>
@@ -63,8 +65,8 @@
             label='Server Paths'
         />
         <template v-else>
-            <div v-for='path in service.paths'>
-                <span v-text='path' />
+            <div v-for='path in service.paths' class='hover-light px-2 py-2'>
+                <span v-text='path.name' />
             </div>
         </template>
     </div>