diff --git a/src/app/pages/App.jsx b/src/app/pages/App.jsx
index bb265056..ad73e989 100644
--- a/src/app/pages/App.jsx
+++ b/src/app/pages/App.jsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import {
-  BrowserRouter, Switch, Route, Redirect,
+  BrowserRouter,
 } from 'react-router-dom';
 
 import { isAuthenticated } from '../../client/state/auth';
@@ -11,17 +11,7 @@ import Client from '../templates/client/Client';
 function App() {
   return (
     <BrowserRouter>
-      <Switch>
-        <Route exact path="/">
-          { isAuthenticated() ? <Client /> : <Redirect to="/login" />}
-        </Route>
-        <Route path="/login">
-          { isAuthenticated() ? <Redirect to="/" /> : <Auth type="login" />}
-        </Route>
-        <Route path="/register">
-          { isAuthenticated() ? <Redirect to="/" /> : <Auth type="register" />}
-        </Route>
-      </Switch>
+      { isAuthenticated() ? <Client /> : <Auth />}
     </BrowserRouter>
   );
 }
diff --git a/src/app/templates/auth/Auth.jsx b/src/app/templates/auth/Auth.jsx
index 3eaf16a8..f2d2b1eb 100644
--- a/src/app/templates/auth/Auth.jsx
+++ b/src/app/templates/auth/Auth.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import './Auth.scss';
 import ReCAPTCHA from 'react-google-recaptcha';
 
-import { Link, useLocation } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
 import * as auth from '../../../client/action/auth';
 import cons from '../../../client/state/cons';
 
@@ -75,7 +75,8 @@ function normalizeUsername(rawUsername) {
   return noLeadingAt.trim();
 }
 
-function Auth({ type }) {
+function Auth() {
+  const [type, setType] = useState('login');
   const [process, changeProcess] = useState(null);
   const [homeserver, changeHomeserver] = useState('matrix.org');
 
@@ -316,9 +317,16 @@ function Auth({ type }) {
         <div className="flex--center">
           <Text variant="b2">
             {`${(type === 'login' ? 'Don\'t have' : 'Already have')} an account?`}
-            <Link to={type === 'login' ? '/register' : '/login'}>
+            <button
+              type="button"
+              style={{ color: 'var(--tc-link)', cursor: 'pointer', margin: '0 var(--sp-ultra-tight)' }}
+              onClick={() => {
+                if (type === 'login') setType('register');
+                else setType('login');
+              }}
+            >
               { type === 'login' ? ' Register' : ' Login' }
-            </Link>
+            </button>
           </Text>
         </div>
       </StaticWrapper>
@@ -326,10 +334,6 @@ function Auth({ type }) {
   );
 }
 
-Auth.propTypes = {
-  type: PropTypes.string.isRequired,
-};
-
 function StaticWrapper({ children }) {
   return (
     <ScrollView invisible>