diff --git a/src/components/Navbar/NavbarActions.vue b/src/components/Navbar/NavbarActions.vue
index da6ed1a887..dcc81f3cc4 100644
--- a/src/components/Navbar/NavbarActions.vue
+++ b/src/components/Navbar/NavbarActions.vue
@@ -134,7 +134,7 @@ export default {
   methods: {
     logout() {
       this.$store.commit('LOGOUT')
-      this.$router.push('/login')
+      this.$router.push({ name: 'login' })
     },
     toggleSpeed() {
       qbit.toggleSpeedLimitsMode()
diff --git a/src/router.js b/src/router.js
index cfa443465b..a1d2e0fe03 100644
--- a/src/router.js
+++ b/src/router.js
@@ -25,19 +25,14 @@ const router = new Router({
       name: 'login',
       component: Login,
       meta: {
-        public: true, // Allow access to even if not logged in
-        onlyWhenLoggedOut: true
+        public: true // Allow access to even if not logged in      }
       }
     }
-
   ]
 })
 
 router.beforeEach(async (to, from, next) => {
   const isPublic = to.matched.some(record => record.meta.public)
-  const onlyWhenLoggedOut = to.matched.some(
-    record => record.meta.onlyWhenLoggedOut
-  )
   const authenticated = isAuthenticated()
 
   if (!isPublic && !authenticated) {
@@ -48,12 +43,6 @@ router.beforeEach(async (to, from, next) => {
     })
   }
 
-  // Do not allow user to visit login page or register page
-  // if they are logged in
-  if (authenticated && onlyWhenLoggedOut) {
-    return next('/')
-  }
-
   next()
 })
 
diff --git a/src/views/Login.vue b/src/views/Login.vue
index b84dccdeee..358e0e0606 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -48,6 +48,8 @@
 
 <script>
 import { mdiLock, mdiAccount } from '@mdi/js'
+import { isAuthenticated } from '@/services/auth.js'
+
 export default {
   name: 'Login',
   data() {
@@ -58,6 +60,11 @@ export default {
       mdiLock, mdiAccount
     }
   },
+  mounted() {
+    if (isAuthenticated()) {
+      this.$router.push('/')
+    }
+  },
   methods: {
     async Login() {
       const authenticated = await this.$store.dispatch('LOGIN', {