diff --git a/src/containers/soapbox.tsx b/src/containers/soapbox.tsx
index 79af39c48..38614bba6 100644
--- a/src/containers/soapbox.tsx
+++ b/src/containers/soapbox.tsx
@@ -104,7 +104,6 @@ const SoapboxMount = () => {
         <Route exact path='/' component={PublicLayout} />
       )}
 
-      <Route path='/edit-password' component={AuthLayout} />
       <Route path='/invite/:token' component={AuthLayout} />
 
       <Route path='/' component={UI} />
diff --git a/src/features/auth-layout/index.tsx b/src/features/auth-layout/index.tsx
index 988996aed..fec9d4d3b 100644
--- a/src/features/auth-layout/index.tsx
+++ b/src/features/auth-layout/index.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
-import { Link, Redirect, Route, Switch, useHistory, useLocation } from 'react-router-dom';
+import { Link, Redirect, Route, Switch, useHistory } from 'react-router-dom';
 
 import LandingGradient from 'soapbox/components/landing-gradient';
 import SiteLogo from 'soapbox/components/site-logo';
@@ -8,7 +8,6 @@ import { useOwnAccount, useInstance, useRegistrationStatus } from 'soapbox/hooks
 
 import { Button, Card, CardBody } from '../../components/ui';
 import LoginPage from '../auth-login/components/login-page';
-import PasswordResetConfirm from '../auth-login/components/password-reset-confirm';
 import ExternalLoginForm from '../external-login/components/external-login-form';
 import Footer from '../public-layout/components/footer';
 import RegisterInvite from '../register-invite';
@@ -20,7 +19,6 @@ const messages = defineMessages({
 const AuthLayout = () => {
   const intl = useIntl();
   const history = useHistory();
-  const { search } = useLocation();
 
   const { account } = useOwnAccount();
   const instance = useInstance();
@@ -63,11 +61,7 @@ const AuthLayout = () => {
 
                     <Route exact path='/login/external' component={ExternalLoginForm} />
                     <Route exact path='/login/add' component={LoginPage} />
-                    <Route exact path='/edit-password' component={PasswordResetConfirm} />
                     <Route path='/invite/:token' component={RegisterInvite} />
-
-                    <Redirect from='/auth/password/new' to='/reset-password' />
-                    <Redirect from='/auth/password/edit' to={`/edit-password${search}`} />
                   </Switch>
                 </CardBody>
               </Card>
diff --git a/src/features/ui/index.tsx b/src/features/ui/index.tsx
index e2fa00423..bcb4e1b79 100644
--- a/src/features/ui/index.tsx
+++ b/src/features/ui/index.tsx
@@ -136,6 +136,7 @@ import {
   RegistrationPage,
   LoginPage,
   PasswordReset,
+  PasswordResetConfirm,
 } from './util/async-components';
 import GlobalHotkeys from './util/global-hotkeys';
 import { WrappedRoute } from './util/react-router-helpers';
@@ -361,6 +362,9 @@ const SwitchingColumnsArea: React.FC<ISwitchingColumnsArea> = ({ children }) =>
 
       <WrappedRoute path='/login' page={DefaultPage} component={LoginPage} publicRoute exact />
       <WrappedRoute path='/reset-password' page={DefaultPage} component={PasswordReset} publicRoute exact />
+      <WrappedRoute path='/edit-password' page={DefaultPage} component={PasswordResetConfirm} publicRoute exact />
+      <Redirect from='/auth/password/new' to='/reset-password' />
+      <Redirect from='/auth/password/edit' to={`/edit-password${search}`} />
 
       <WrappedRoute page={EmptyPage} component={GenericNotFound} content={children} />
     </Switch>