diff --git a/src/App.js b/src/App.js
index a0ed407..dde83b5 100644
--- a/src/App.js
+++ b/src/App.js
@@ -5,7 +5,7 @@ import DashboardComponent from './components/views/dashboard'
 import EditComponent from './components/views/edit'
 import LogoutComponent from './components/views/logout'
 import ForgotComponent from './components/views/forgot'
-import { UsernameToken, UserExistsToken, AuthenticatedToken } from './components/token'
+import { UsernameToken } from './components/token'
 
 import './styles/App.css'
 
@@ -15,68 +15,50 @@ import { BrowserRouter, Route, Switch } from 'react-router-dom'
 
 export default function App() {
     const { username, setUsername } = UsernameToken()
-    const { userExists, setUserExists } = UserExistsToken()
-    const { authenticated, setAuthenticated } = AuthenticatedToken()
 
     return (
         <BrowserRouter>
             <div className="app">
                 <div className="nav-container">
-                    <NavbarComponent username={username} authenticated={authenticated}/>
+                    <NavbarComponent username={username} />
                 </div>
                 <div className="main-container">
                     <Switch>
                         <Route exact path="/">
                             <UserComponent
                                 setUsername={setUsername}
-                                setUserExists={setUserExists}
-                                authenticated={authenticated}
                             />
                         </Route>
                         <Route path="/register">
                             <AuthenticateComponent
                                 username={username}
-                                userExists={userExists}
-                                setUserExists={setUserExists}
-                                authenticated={authenticated}
-                                setAuthenticated={setAuthenticated}
                                 registering={true}
                             />
                         </Route>
                         <Route path="/login">
                             <AuthenticateComponent
                                 username={username}
-                                userExists={userExists}
-                                setUserExists={setUserExists}
-                                authenticated={authenticated}
-                                setAuthenticated={setAuthenticated}
                                 registering={false}
                             />
                         </Route>
                         <Route path="/dashboard">
                             <DashboardComponent
                                 username={username}
-                                authenticated={authenticated}
                             />
                         </Route>
                         <Route path="/edit">
                             <EditComponent
                                 username={username}
-                                authenticated={authenticated}
                             />
                         </Route>
                         <Route path="/logout">
                             <LogoutComponent
                                 username={username}
-                                authenticated={authenticated}
-                                setAuthenticated={setAuthenticated}
                             />
                         </Route>
                         <Route path="/forgot">
                             <ForgotComponent
                                 username={username}
-                                authenticated={authenticated}
-                                setAuthenticated={setAuthenticated}
                             />
                         </Route>
                     </Switch>
diff --git a/src/components/token.js b/src/components/token.js
index 8b2d1a9..68d5235 100644
--- a/src/components/token.js
+++ b/src/components/token.js
@@ -19,44 +19,6 @@ export function UsernameToken() {
     }
 }
 
-export function UserExistsToken() {
-    const getUserExists = () => {
-        const existsToken = JSON.parse(localStorage.getItem('exists'))
-        return existsToken
-    }
-
-    const [exists, setUserExists] = useState(getUserExists())
-
-    const saveUserExists = existsToken => {
-        localStorage.setItem('exists', JSON.stringify(existsToken))
-        setUserExists(existsToken)
-    }
-
-    return {
-        setUserExists: saveUserExists,
-        exists
-    }
-}
-
-export function AuthenticatedToken() {
-    const getAuthenticated = () => {
-        const authToken = JSON.parse(localStorage.getItem('authenticated'))
-        return authToken
-    }
-
-    const [authenticated, setAuthenticated] = useState(getAuthenticated())
-
-    const saveAuthenticated = authToken => {
-        localStorage.setItem('authenticated', JSON.stringify(authToken))
-        setAuthenticated(authToken)
-    }
-
-    return {
-        setAuthenticated: saveAuthenticated,
-        authenticated
-    }
-}
-
 export function ClearToken(tokenName) {
     localStorage.removeItem(tokenName)
 }
diff --git a/src/components/views/authenticate.js b/src/components/views/authenticate.js
index 73bd0dc..ac55496 100644
--- a/src/components/views/authenticate.js
+++ b/src/components/views/authenticate.js
@@ -13,10 +13,6 @@ import "../../styles/authenticate.css"
 
 export default function AuthenticateComponent({
     username,
-    userExists,
-    setUserExists,
-    authenticated,
-    setAuthenticated,
     registering
 }) {
     const [loading, setLoading] = useState(false)
@@ -155,14 +151,14 @@ export default function AuthenticateComponent({
             })
     }
 
-    const handleLockChange = async (files) => {
+    const handleLockChange = (files) => {
         setLockFiles(files)
-        await generateFileList(files, null)
+        generateFileList(files, null)
     }
 
-    const handleUnlockChange = async (files) => {
+    const handleUnlockChange = (files) => {
         setUnlockFiles(files)
-        await generateFileList(null, files)
+        generateFileList(null, files)
     }
 
     const handleSubmit = async e => {
@@ -174,10 +170,10 @@ export default function AuthenticateComponent({
             const userCreateRes = await createUser()
             setLoading(false)
 
-            // If successful at creating user, move to login
+            // If successful at creating user, move to dashboard
             if (userCreateRes === true) {
-                setUserExists(userCreateRes)
-                setAuthenticated(true)
+                localStorage.setItem('exists', true)
+                localStorage.setItem('authenticated', true)
                 window.location.href = "/dashboard"
             } else {
                 // If unsuccessful, return to default registration with error alert
@@ -195,10 +191,9 @@ export default function AuthenticateComponent({
 
             // If successful at logging in user, move to dashboard
             if (userLoginRes === true) {
-                setAuthenticated(true)
+                localStorage.setItem('authenticated', true)
                 window.location.href = "/dashboard"
             } else if (userLoginRes.CODE === 10) {
-                setAuthenticated(false)
                 alert(`Failed to login with given face or unlock credentials\n${userLoginRes.MESSAGE}`)
                 window.location.href = "/login"
             } else {
@@ -263,13 +258,13 @@ export default function AuthenticateComponent({
                             <Form.File.Label>Chose at least 4 gestures as your lock gesture combination (OPTIONAL)</Form.File.Label>
                             <Form.File.Input multiple/>
                         </Form.File>
-                        <Form.Check
-                            type="checkbox"
-                            label="Show Lock Combination"
-                            defaultChecked={showLockDisplay}
-                            onChange={() => setShowLockDisplay(!showLockDisplay)}
-                        />
                     </Form.Group>
+                    <Form.Check
+                        type="checkbox"
+                        label="Show Lock Combination"
+                        defaultChecked={showLockDisplay}
+                        onChange={() => setShowLockDisplay(!showLockDisplay)}
+                    />
                     <Form.Group onChange={(e) => handleUnlockChange(e.target.files)}>
                         <Form.File
                             id="unlock_gesture_form"
@@ -278,13 +273,13 @@ export default function AuthenticateComponent({
                             <Form.File.Label>Chose at least 4 other gestures as your unlock gesture combination</Form.File.Label>
                             <Form.File.Input multiple/>
                         </Form.File>
-                        <Form.Check
-                            type="checkbox"
-                            label="Show Unlock Combination"
-                            defaultChecked={showUnlockDisplay}
-                            onChange={() => setShowUnlockDisplay(!showUnlockDisplay)}
-                        />
                     </Form.Group>
+                    <Form.Check
+                        type="checkbox"
+                        label="Show Unlock Combination"
+                        defaultChecked={showUnlockDisplay}
+                        onChange={() => setShowUnlockDisplay(!showUnlockDisplay)}
+                    />
                 </div>
             )
         } else {
@@ -310,13 +305,13 @@ export default function AuthenticateComponent({
                             <Form.File.Label>Please enter your unlock combination</Form.File.Label>
                             <Form.File.Input multiple/>
                         </Form.File>
-                        <Form.Check
-                            type="checkbox"
-                            label="Show Unlock Combination"
-                            defaultChecked={showUnlockDisplay}
-                            onChange={() => setShowUnlockDisplay(!showUnlockDisplay)}
-                        />
                     </Form.Group>
+                    <Form.Check
+                        type="checkbox"
+                        label="Show Unlock Combination"
+                        defaultChecked={showUnlockDisplay}
+                        onChange={() => setShowUnlockDisplay(!showUnlockDisplay)}
+                    />
                     <Button variant="danger" href="/forgot">Forgotten Unlock Combination</Button>
                 </div>
             )
@@ -345,13 +340,13 @@ export default function AuthenticateComponent({
         }
     }
 
-    if (authenticated) {
+    if (localStorage.getItem('authenticated')) {
         window.location.href = "/dashboard"
-    } else if (!username || !localStorage.getItem("exists")) {
+    } else if (!username) {
         window.location.href = "/"
-    } else if (localStorage.getItem("exists") === 'true' && window.location.pathname === "/register") {
+    } else if (localStorage.getItem('exists') === 'true' && window.location.pathname === "/register" && !localStorage.getItem('authenticated')) {
         window.location.href = "/login"
-    } else if (localStorage.getItem("exists") === 'false' && window.location.pathname === "/login") {
+    } else if (localStorage.getItem('exists') === 'false' && window.location.pathname === "/login" && !localStorage.getItem('authenticated')) {
         window.location.href = "/register"
     } else {
         if (navigator.mediaDevices.getUserMedia !== null) {
@@ -392,9 +387,5 @@ export default function AuthenticateComponent({
 
 AuthenticateComponent.propTypes = {
     username: PropTypes.string,
-    userExists: PropTypes.bool,
-    setUserExists: PropTypes.func,
-    authenticated: PropTypes.bool,
-    setAuthenticated: PropTypes.func,
     registering: PropTypes.bool.isRequired
 }
diff --git a/src/components/views/dashboard.js b/src/components/views/dashboard.js
index 2ba10e3..7b1df62 100644
--- a/src/components/views/dashboard.js
+++ b/src/components/views/dashboard.js
@@ -8,7 +8,7 @@ import '../../styles/dashboard.css'
 
 import { ClearTokens } from '../token'
 
-export default function DashboardComponent({ username, authenticated }) {
+export default function DashboardComponent({ username }) {
     const [deleting, setDeleting] = useState(false)
 
     const handleDeleteClick = async e => {
@@ -51,7 +51,7 @@ export default function DashboardComponent({ username, authenticated }) {
         }
     }
 
-    if (!authenticated) {
+    if (!localStorage.getItem('authenticated')) {
         window.location.href = "/"
     } else {
         if (deleting) {
diff --git a/src/components/views/edit.js b/src/components/views/edit.js
index 3723b0d..b29c502 100644
--- a/src/components/views/edit.js
+++ b/src/components/views/edit.js
@@ -9,7 +9,7 @@ import Webcam from 'react-webcam'
 
 import { uploadFiles, uploadEncoded, checkCombination } from '../middleware'
 
-export default function EditComponent({ username, authenticated }) {
+export default function EditComponent({ username }) {
     const [loading, setLoading] = useState(false)
     const [streaming, setStreaming] = useState(false)
     const [editFace, setEditFace] = useState(false)
@@ -171,32 +171,34 @@ export default function EditComponent({ username, authenticated }) {
                             <Form.File.Label>Lock Gesture Combination</Form.File.Label>
                             <Form.File.Input multiple/>
                         </Form.File>
-                        <Form.Check
-                            type="checkbox"
-                            label="Show Lock Combination"
-                            defaultChecked={false}
-                            onChange={() => setShowLockDisplay(!showLockDisplay)}
-                        />
                     </Form.Group>
+                    <Form.Check
+                        type="checkbox"
+                        label="Show Lock Combination"
+                        defaultChecked={false}
+                        onChange={() => setShowLockDisplay(!showLockDisplay)}
+                    />
                 </fieldset>
             )
         } else {
             return (
-                <Form.Group onChange={(e) => handleLockChange(e.target.files)}>
-                    <Form.File
-                        id="lock_gesture_form"
-                        type="file"
-                    >
-                        <Form.File.Label>Lock Gesture Combination</Form.File.Label>
-                        <Form.File.Input multiple/>
-                    </Form.File>
+                <div>
+                    <Form.Group onChange={(e) => handleLockChange(e.target.files)}>
+                        <Form.File
+                            id="lock_gesture_form"
+                            type="file"
+                        >
+                            <Form.File.Label>Lock Gesture Combination</Form.File.Label>
+                            <Form.File.Input multiple/>
+                        </Form.File>
+                    </Form.Group>
                     <Form.Check
                         type="checkbox"
                         label="Show Lock Combination"
                         defaultChecked={showLockDisplay}
                         onChange={() => setShowLockDisplay(!showLockDisplay)}
                     />
-                </Form.Group>
+                </div>
             )
         }
     }
@@ -232,7 +234,7 @@ export default function EditComponent({ username, authenticated }) {
         }
     }
 
-    if (!authenticated) {
+    if (!localStorage.getItem('authenticated')) {
         window.location.href = "/"
     } else {
         if (navigator.mediaDevices.getUserMedia !== null && editFace === true) {
@@ -286,13 +288,13 @@ export default function EditComponent({ username, authenticated }) {
                             <Form.File.Label>Unlock Gesture Combination</Form.File.Label>
                             <Form.File.Input multiple/>
                         </Form.File>
-                        <Form.Check
-                            type="checkbox"
-                            label="Show Unlock Combination"
-                            defaultChecked={showUnlockDisplay}
-                            onChange={() => setShowUnlockDisplay(!showUnlockDisplay)}
-                        />
                     </Form.Group>
+                    <Form.Check
+                        type="checkbox"
+                        label="Show Unlock Combination"
+                        defaultChecked={showUnlockDisplay}
+                        onChange={() => setShowUnlockDisplay(!showUnlockDisplay)}
+                    />
                     {getButton()}
                 </Form>
                 <ListGroup className="lock-display" hidden={!showLockDisplay}>
@@ -307,6 +309,5 @@ export default function EditComponent({ username, authenticated }) {
 }
 
 EditComponent.propTypes = {
-    username: PropTypes.string,
-    authenticated: PropTypes.bool
+    username: PropTypes.string
 }
diff --git a/src/components/views/forgot.js b/src/components/views/forgot.js
index 2362ac7..687e048 100644
--- a/src/components/views/forgot.js
+++ b/src/components/views/forgot.js
@@ -11,7 +11,7 @@ import { uploadFiles, uploadEncoded, checkIfLock, checkCombination } from '../mi
 
 import '../../styles/forgot.css'
 
-export default function ForgotComponent({username, authenticated, setAuthenticated}) {
+export default function ForgotComponent({username}) {
     const [files, setFiles] = useState()
     const [loading, setLoading] = useState(false)
     const [streaming, setStreaming] = useState(false)
@@ -74,7 +74,7 @@ export default function ForgotComponent({username, authenticated, setAuthenticat
             setLoading(false)
 
             if (checkFace === true) {
-                setAuthenticated(true)
+                localStorage.setItem('authenticated', true)
                 alert("Face matches, you are now logged in and can change your gesture combinations")
                 window.location.href = "/edit"
             } else {
@@ -90,7 +90,7 @@ export default function ForgotComponent({username, authenticated, setAuthenticat
             setLoading(false)
 
             if (checkRes === true) {
-                setAuthenticated(true)
+                localStorage.setItem('authenticated', true)
                 alert("Lock combination is correct, you are now signed in and can change your unlock combination")
                 window.location.href = "/edit"
             } else {
@@ -195,32 +195,34 @@ export default function ForgotComponent({username, authenticated, setAuthenticat
                             <Form.File.Label>Recovering your lock and unlock combinations using your face...</Form.File.Label>
                             <Form.File.Input multiple/>
                         </Form.File>
-                        <Form.Check
-                            type="checkbox"
-                            label="Show Lock Combination"
-                            defaultChecked={showDisplay}
-                            onChange={() => setShowGestureDisplay(!showDisplay)}
-                        />
                     </Form.Group>
+                    <Form.Check
+                        type="checkbox"
+                        label="Show Lock Combination"
+                        defaultChecked={showDisplay}
+                        onChange={() => setShowGestureDisplay(!showDisplay)}
+                    />
                 </fieldset>
             )
         } else {
             return (
-                <Form.Group onChange={(e) => handleGestureChange(e.target.files)}>
-                    <Form.File
-                        id="gesture_form"
-                        type="file"
-                    >
-                        <Form.File.Label>Enter your Lock combination</Form.File.Label>
-                        <Form.File.Input multiple/>
-                    </Form.File>
+                <div>
+                    <Form.Group onChange={(e) => handleGestureChange(e.target.files)}>
+                        <Form.File
+                            id="gesture_form"
+                            type="file"
+                        >
+                            <Form.File.Label>Enter your Lock combination</Form.File.Label>
+                            <Form.File.Input multiple/>
+                        </Form.File>
+                    </Form.Group>
                     <Form.Check
                         type="checkbox"
                         label="Show Lock Combination"
                         defaultChecked={showDisplay}
                         onChange={() => setShowGestureDisplay(!showDisplay)}
                     />
-                </Form.Group>
+                </div>
             )
         }
     }
@@ -247,9 +249,9 @@ export default function ForgotComponent({username, authenticated, setAuthenticat
         fetchLock()
     }, [username, hasLock])
 
-    if (!username || (!localStorage.getItem('exists') || localStorage.getItem('exists') === 'false')) {
+    if (!username || localStorage.getItem('exists') !== 'true') {
         window.location.href = "/"
-    } else if (authenticated) {
+    } else if (localStorage.getItem('authenticated') === 'true') {
         window.location.href = "/dashboard"
     } else {
         return (
@@ -279,7 +281,5 @@ export default function ForgotComponent({username, authenticated, setAuthenticat
 }
 
 ForgotComponent.propTypes = {
-    username: PropTypes.string,
-    authenticated: PropTypes.bool,
-    setAuthenticated: PropTypes.func.isRequired
+    username: PropTypes.string
 }
diff --git a/src/components/views/logout.js b/src/components/views/logout.js
index 65da42e..860f1f7 100644
--- a/src/components/views/logout.js
+++ b/src/components/views/logout.js
@@ -12,7 +12,7 @@ import { uploadFiles, uploadEncoded, checkIfLock, checkCombination } from '../mi
 
 import '../../styles/logout.css'
 
-export default function LogoutComponent({ username, authenticated, setAuthenticated }) {
+export default function LogoutComponent({ username }) {
     const [loading, setLoading] = useState(false)
     const [streaming, setStreaming] = useState(false)
     const [lockFiles, setLockFiles] = useState({})
@@ -137,7 +137,7 @@ export default function LogoutComponent({ username, authenticated, setAuthentica
         fetchLock()
     }, [username, setHasLock])
 
-    if (!authenticated || hasLock === false) {
+    if (!localStorage.getItem('authenticated') || hasLock === false) {
         ClearTokens()
         window.location.href = "/"
     } else {
@@ -170,13 +170,13 @@ export default function LogoutComponent({ username, authenticated, setAuthentica
                                 <Form.File.Label>Lock Combination (if you have forgotten it, <a href="/edit">edit it here</a>)</Form.File.Label>
                                 <Form.File.Input multiple/>
                             </Form.File>
-                            <Form.Check
-                                type="checkbox"
-                                label="Show Lock Combination"
-                                defaultChecked={showLockDisplay}
-                                onChange={() => setShowLockDisplay(!showLockDisplay)}
-                            />
                         </Form.Group>
+                        <Form.Check
+                            type="checkbox"
+                            label="Show Lock Combination"
+                            defaultChecked={showLockDisplay}
+                            onChange={() => setShowLockDisplay(!showLockDisplay)}
+                        />
                         <fieldset disabled>
                             <Form.Group>
                                 <Form.File
@@ -200,7 +200,5 @@ export default function LogoutComponent({ username, authenticated, setAuthentica
 }
 
 LogoutComponent.propTypes = {
-    username: PropTypes.string,
-    authenticated: PropTypes.bool,
-    setAuthenticated: PropTypes.func
+    username: PropTypes.string
 }
diff --git a/src/components/views/navbar.js b/src/components/views/navbar.js
index e4a6971..f947f7e 100644
--- a/src/components/views/navbar.js
+++ b/src/components/views/navbar.js
@@ -11,7 +11,7 @@ function profileText(username, authenticated) {
             <Nav.Item id="nav_user">Not Signed In</Nav.Item>
         )
     } else {
-        if (authenticated === true) {
+        if (authenticated === 'true') {
             return (
                 <Nav.Item id="nav_user">Logged in as: {username}</Nav.Item>
             )
@@ -43,7 +43,7 @@ export default class NavbarComponent extends Component {
                     </Navbar.Collapse>
                     <Navbar.Collapse className="justify-content-end">
                         <Nav className="auto">
-                            {profileText(this.props.username, this.props.authenticated)}
+                            {profileText(this.props.username, localStorage.getItem('authenticated'))}
                         </Nav>
                     </Navbar.Collapse>
                 </Navbar>
@@ -53,11 +53,9 @@ export default class NavbarComponent extends Component {
 }
 
 NavbarComponent.propTypes = {
-    username: PropTypes.string,
-    authenticated: PropTypes.bool
+    username: PropTypes.string
 }
 
 NavbarComponent.defaultProps = {
-    username: null,
-    authenticated: false
+    username: null
 }
\ No newline at end of file
diff --git a/src/components/views/user.js b/src/components/views/user.js
index 2d77e29..b12a39f 100644
--- a/src/components/views/user.js
+++ b/src/components/views/user.js
@@ -35,7 +35,7 @@ async function userExists(username) {
         })
 }
 
-export default function UserComponent({ setUsername, setUserExists, authenticated }) {
+export default function UserComponent({ setUsername }) {
     const [username, setName] = useState()
     const [loading, setLoading] = useState(false)
 
@@ -59,7 +59,7 @@ export default function UserComponent({ setUsername, setUserExists, authenticate
                 alert(exists)
                 window.location.reload()
             } else {
-                setUserExists(exists)
+                localStorage.setItem('exists', exists)
 
                 if (exists === true) {
                     window.location.href = "/login"
@@ -92,7 +92,7 @@ export default function UserComponent({ setUsername, setUserExists, authenticate
         }
     }
 
-    if (authenticated) {
+    if (localStorage.getItem('authenticated')) {
         window.location.href = "/dashboard"
     }
 
@@ -115,7 +115,5 @@ export default function UserComponent({ setUsername, setUserExists, authenticate
 }
 
 UserComponent.propTypes = {
-    setUsername: PropTypes.func,
-    setUserExists: PropTypes.func,
-    authenticated: PropTypes.bool
+    setUsername: PropTypes.func
 }
\ No newline at end of file