diff --git a/src/controllers/dashboard/users/useredit.html b/src/controllers/dashboard/users/useredit.html
deleted file mode 100644
index e4b6afd33..000000000
--- a/src/controllers/dashboard/users/useredit.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="editUserPage" data-role="page" class="page type-interior">
-
-</div>
diff --git a/src/controllers/dashboard/users/userprofiles.html b/src/controllers/dashboard/users/userprofiles.html
deleted file mode 100644
index 047cdff1f..000000000
--- a/src/controllers/dashboard/users/userprofiles.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div id="userProfilesPage" data-role="page" class="page type-interior userProfilesPage fullWidthContent">
-
-</div>
diff --git a/src/components/pages/UserEditPage.tsx b/src/routes/UserEditPage.tsx
similarity index 96%
rename from src/components/pages/UserEditPage.tsx
rename to src/routes/UserEditPage.tsx
index d08f21347..a88a4d10c 100644
--- a/src/components/pages/UserEditPage.tsx
+++ b/src/routes/UserEditPage.tsx
@@ -1,19 +1,20 @@
 import { SyncPlayUserAccessType, UserDto } from '@thornbill/jellyfin-sdk/dist/generated-client';
 import React, { FunctionComponent, useCallback, useEffect, useState, useRef } from 'react';
-import Dashboard from '../../utils/dashboard';
-import globalize from '../../scripts/globalize';
-import LibraryMenu from '../../scripts/libraryMenu';
-import ButtonElement from '../dashboard/elements/ButtonElement';
-import CheckBoxElement from '../dashboard/elements/CheckBoxElement';
-import InputElement from '../dashboard/elements/InputElement';
-import LinkEditUserPreferences from '../dashboard/users/LinkEditUserPreferences';
-import SectionTitleContainer from '../dashboard/elements/SectionTitleContainer';
-import SectionTabs from '../dashboard/users/SectionTabs';
-import loading from '../loading/loading';
-import toast from '../toast/toast';
-import { getParameterByName } from '../../utils/url';
+import Dashboard from '../utils/dashboard';
+import globalize from '../scripts/globalize';
+import LibraryMenu from '../scripts/libraryMenu';
+import ButtonElement from '../components/dashboard/elements/ButtonElement';
+import CheckBoxElement from '../components/dashboard/elements/CheckBoxElement';
+import InputElement from '../components/dashboard/elements/InputElement';
+import LinkEditUserPreferences from '../components/dashboard/users/LinkEditUserPreferences';
+import SectionTitleContainer from '../components/dashboard/elements/SectionTitleContainer';
+import SectionTabs from '../components/dashboard/users/SectionTabs';
+import loading from '../components/loading/loading';
+import toast from '../components/toast/toast';
+import { getParameterByName } from '../utils/url';
 import escapeHTML from 'escape-html';
-import SelectElement from '../dashboard/elements/SelectElement';
+import SelectElement from '../components/dashboard/elements/SelectElement';
+import Page from '../components/Page';
 
 type ItemsArr = {
     Name?: string;
@@ -298,8 +299,11 @@ const UserEditPage: FunctionComponent = () => {
     };
 
     return (
-        <div ref={element}>
-            <div className='content-primary'>
+        <Page
+            id='editUserPage'
+            className='mainAnimatedPage type-interior'
+        >
+            <div ref={element} className='content-primary'>
                 <div className='verticalSection'>
                     <SectionTitleContainer
                         title={userName}
@@ -569,7 +573,8 @@ const UserEditPage: FunctionComponent = () => {
                     </div>
                 </form>
             </div>
-        </div>
+        </Page>
+
     );
 };
 
diff --git a/src/routes/index.tsx b/src/routes/index.tsx
index 227e5dd7a..c15d1f6d4 100644
--- a/src/routes/index.tsx
+++ b/src/routes/index.tsx
@@ -4,6 +4,7 @@ import { Route, Routes } from 'react-router-dom';
 import ConnectionRequired from '../components/ConnectionRequired';
 import NewUserPage from './NewUserPage';
 import SearchPage from './search';
+import UserEditPage from './UserEditPage';
 import UserProfilesPage from './UserProfilesPage';
 
 const AppRoutes = () => (
@@ -33,6 +34,14 @@ const AppRoutes = () => (
                     </ConnectionRequired>
                 }
             />
+            <Route
+                path='useredit.html'
+                element={
+                    <ConnectionRequired>
+                        <UserEditPage />
+                    </ConnectionRequired>
+                }
+            />
             {/* Suppress warnings for unhandled routes */}
             <Route path='*' element={null} />
         </Route>
diff --git a/src/scripts/routes.js b/src/scripts/routes.js
index 58914350c..95bf83d71 100644
--- a/src/scripts/routes.js
+++ b/src/scripts/routes.js
@@ -429,14 +429,6 @@ import { appRouter } from '../components/appRouter';
         controller: 'shows/tvrecommended'
     });
 
-    defineRoute({
-        alias: '/useredit.html',
-        path: 'dashboard/users/useredit.html',
-        autoFocus: false,
-        roles: 'admin',
-        pageComponent: 'UserEditPage'
-    });
-
     defineRoute({
         alias: '/userlibraryaccess.html',
         path: 'dashboard/users/userlibraryaccess.html',