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/bootstrap.js b/resources/assets/scripts/bootstrap.js
index 8d2009067..f29ff0528 100644
--- a/resources/assets/scripts/bootstrap.js
+++ b/resources/assets/scripts/bootstrap.js
@@ -17,8 +17,8 @@ try {
  */
 
 window.axios = require('axios');
-
 window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
+window.axios.defaults.headers.common['Accept'] = 'application/json';
 
 /**
  * Next we will register the CSRF Token as a common header with Axios so that
diff --git a/resources/assets/scripts/components/auth/ForgotPassword.vue b/resources/assets/scripts/components/auth/ForgotPassword.vue
index c224fd778..5a5dc42b8 100644
--- a/resources/assets/scripts/components/auth/ForgotPassword.vue
+++ b/resources/assets/scripts/components/auth/ForgotPassword.vue
@@ -70,6 +70,10 @@
                     email: this.$props.email,
                 })
                     .then(function (response) {
+                        if (!(response.data instanceof Object)) {
+                            throw new Error('An error was encountered while processing this request.');
+                        }
+
                         self.$data.submitDisabled = false;
                         self.$data.showSpinner = false;
                         self.success(response.data.status);
diff --git a/resources/assets/scripts/components/auth/LoginForm.vue b/resources/assets/scripts/components/auth/LoginForm.vue
index 067fb9290..ef3713f61 100644
--- a/resources/assets/scripts/components/auth/LoginForm.vue
+++ b/resources/assets/scripts/components/auth/LoginForm.vue
@@ -82,6 +82,12 @@
                     password: this.$props.user.password,
                 })
                     .then(function (response) {
+                        // If there is a 302 redirect or some other odd behavior (basically, response that isnt
+                        // in JSON format) throw an error and don't try to continue with the login.
+                        if (!(response.data instanceof Object)) {
+                            throw new Error('An error was encountered while processing this request.');
+                        }
+
                         if (response.data.complete) {
                             return window.location = '/';
                         }
@@ -93,6 +99,8 @@
                     .catch(function (err) {
                         self.$props.user.password = '';
                         self.$data.showSpinner = false;
+                        self.$refs.password.focus();
+
                         if (!err.response) {
                             return console.error(err);
                         }
@@ -102,7 +110,6 @@
                             response.data.errors.forEach(function (error) {
                                 self.error(error.detail);
                             });
-                            self.$refs.password.focus();
                         }
                     });
             },
diff --git a/resources/assets/scripts/components/auth/ResetPassword.vue b/resources/assets/scripts/components/auth/ResetPassword.vue
index 2a7cf17a6..cda6716ac 100644
--- a/resources/assets/scripts/components/auth/ResetPassword.vue
+++ b/resources/assets/scripts/components/auth/ResetPassword.vue
@@ -93,6 +93,10 @@
                     token: this.$props.token,
                 })
                     .then(function (response) {
+                        if (!(response.data instanceof Object)) {
+                            throw new Error('An error was encountered while processing this login.');
+                        }
+
                         return window.location = response.data.redirect_to;
                     })
                     .catch(function (err) {
diff --git a/resources/assets/scripts/components/auth/TwoFactorForm.vue b/resources/assets/scripts/components/auth/TwoFactorForm.vue
index 27d2b2282..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: {
@@ -49,6 +53,10 @@
                     authentication_code: this.$data.code,
                 })
                     .then(function (response) {
+                        if (!(response.data instanceof Object)) {
+                            throw new Error('An error was encountered while processing this login.');
+                        }
+
                         window.location = response.data.intended;
                     })
                     .catch(function (err) {