diff --git a/resources/assets/scripts/app.js b/resources/assets/scripts/app.js
index 180df2a40..1a6b9476c 100644
--- a/resources/assets/scripts/app.js
+++ b/resources/assets/scripts/app.js
@@ -35,7 +35,7 @@ const router = new VueRouter({
     routes: [
         { name: 'login', path: '/auth/login', component: Login },
         { name: 'forgot-password', path: '/auth/password', component: Login },
-        { name: 'checkpoint', path: '/checkpoint', component: Login },
+        { name: 'checkpoint', path: '/auth/checkpoint', component: Login },
         {
             name: 'reset-password',
             path: '/auth/password/reset/:token',
diff --git a/resources/assets/scripts/components/auth/TwoFactorForm.vue b/resources/assets/scripts/components/auth/TwoFactorForm.vue
index fb51090f3..84a0461d5 100644
--- a/resources/assets/scripts/components/auth/TwoFactorForm.vue
+++ b/resources/assets/scripts/components/auth/TwoFactorForm.vue
@@ -37,6 +37,10 @@
             };
         },
         mounted: function () {
+            if ((this.$route.query.token || '').length < 1) {
+                return this.$router.push({ name: 'login' });
+            }
+
             this.$refs.code.focus();
         },
         methods: {