diff --git a/app/Http/Controllers/Api/Client/AccountController.php b/app/Http/Controllers/Api/Client/AccountController.php
index fc0f22ec..84ec07e3 100644
--- a/app/Http/Controllers/Api/Client/AccountController.php
+++ b/app/Http/Controllers/Api/Client/AccountController.php
@@ -40,7 +40,7 @@ class AccountController extends ClientApiController
     /**
      * Update the authenticated user's email address if their password matches.
      *
-     * @param UpdateEmailRequest $request
+     * @param \Pterodactyl\Http\Requests\Api\Client\Account\UpdateEmailRequest $request
      * @return array
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
@@ -48,9 +48,7 @@ class AccountController extends ClientApiController
      */
     public function updateEmail(UpdateEmailRequest $request): array
     {
-        $updated = $this->updateService->handle($request->user(), [
-            'email' => $request->input('email'),
-        ]);
+        $updated = $this->updateService->handle($request->user(), $request->validated());
 
         return $this->fractal->item($updated->get('model'))
             ->transformWith($this->getTransformer(AccountTransformer::class))
diff --git a/app/Http/Requests/Api/Client/Account/UpdateEmailRequest.php b/app/Http/Requests/Api/Client/Account/UpdateEmailRequest.php
index f354d120..0d8f9ea7 100644
--- a/app/Http/Requests/Api/Client/Account/UpdateEmailRequest.php
+++ b/app/Http/Requests/Api/Client/Account/UpdateEmailRequest.php
@@ -34,9 +34,6 @@ class UpdateEmailRequest extends ClientApiRequest
     {
         $rules = User::getUpdateRulesForId($this->user()->id);
 
-        return [
-            'email' => $rules['email'],
-            'password' => array_merge($rules['password'], ['confirmed']),
-        ];
+        return ['email' => $rules['email']];
     }
 }
diff --git a/resources/assets/scripts/components/core/Navigation.vue b/resources/assets/scripts/components/core/Navigation.vue
index 701fada6..5939355a 100644
--- a/resources/assets/scripts/components/core/Navigation.vue
+++ b/resources/assets/scripts/components/core/Navigation.vue
@@ -23,7 +23,7 @@
                     </a>
                 </li>
                 <li>
-                    <a :href="this.route('auth.logout')">
+                    <a :href="this.route('auth.logout')" v-on:click.prevent="doLogout">
                         <log-out-icon aria-label="Sign out"/>
                     </a>
                 </li>
@@ -37,6 +37,12 @@
 
     export default {
         name: 'navigation',
-        components: { LogOutIcon, ServerIcon, SettingsIcon, UserIcon }
+        components: { LogOutIcon, ServerIcon, SettingsIcon, UserIcon },
+        methods: {
+            doLogout: function () {
+                this.$store.commit('auth/logout');
+                return window.location = this.route('auth.logout');
+            },
+        }
     };
 </script>
diff --git a/resources/assets/scripts/components/dashboard/account/UpdateEmail.vue b/resources/assets/scripts/components/dashboard/account/UpdateEmail.vue
index 0e4d82b6..d8932c97 100644
--- a/resources/assets/scripts/components/dashboard/account/UpdateEmail.vue
+++ b/resources/assets/scripts/components/dashboard/account/UpdateEmail.vue
@@ -16,12 +16,6 @@
                         v-model="password"
                     >
                 </div>
-                <div class="mt-6">
-                    <label for="grid-password-confirm" class="input-label">Confirm password</label>
-                    <input id="grid-password-confirm" name="password_confirmation" type="password" class="input" required
-                        v-model="confirm"
-                    >
-                </div>
                 <div class="mt-6 text-right">
                     <button class="btn btn-blue btn-sm text-right" type="submit">Save</button>
                 </div>
@@ -31,6 +25,7 @@
 </template>
 
 <script>
+    import _ from 'lodash';
     import { mapState, mapActions } from 'vuex';
 
     export default {
@@ -39,7 +34,6 @@
             return {
                 email: '',
                 password: '',
-                confirm: '',
             };
         },
         computed: {
@@ -56,11 +50,11 @@
                 this.clearFlashes();
                 this.updateEmail({
                     email: this.$data.email,
-                    password: this.$data.password,
-                    confirm: this.$data.confirm,
+                    password: this.$data.password
                 })
                     .then(() => {
                         this.success('Your email address has been updated.');
+                        this.$data.password = '';
                     })
                     .catch(error => {
                         if (!error.response) {
diff --git a/resources/assets/scripts/store/modules/auth.js b/resources/assets/scripts/store/modules/auth.js
index 6999f652..04c67970 100644
--- a/resources/assets/scripts/store/modules/auth.js
+++ b/resources/assets/scripts/store/modules/auth.js
@@ -1,4 +1,5 @@
 import User from './../../models/user';
+
 const route = require('./../../../../../vendor/tightenco/ziggy/src/js/route').default;
 
 export default {
@@ -56,37 +57,17 @@ export default {
             });
         },
 
-        /**
-         * Log a user out of the Panel.
-         *
-         * @param commit
-         * @returns {Promise<any>}
-         */
-        logout: function ({commit}) {
-            return new Promise((resolve, reject) => {
-                window.axios.get(route('auth.logout'))
-                    .then(() => {
-                        commit('logout');
-                        return resolve();
-                    })
-                    .catch(reject);
-            })
-        },
-
         /**
          * Update a user's email address on the Panel and store the updated result in Vuex.
          *
          * @param commit
          * @param {String} email
          * @param {String} password
-         * @param {String} confirm
          * @return {Promise<any>}
          */
-        updateEmail: function ({commit}, {email, password, confirm}) {
+        updateEmail: function ({commit}, {email, password}) {
             return new Promise((resolve, reject) => {
-                window.axios.put(route('api.client.account.update-email'), {
-                    email, password, password_confirmation: confirm
-                })
+                window.axios.put(route('api.client.account.update-email'), {email, password})
                     .then(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.
diff --git a/routes/auth.php b/routes/auth.php
index 3ae4967b..a6038447 100644
--- a/routes/auth.php
+++ b/routes/auth.php
@@ -8,7 +8,7 @@
 | Endpoint: /auth
 |
 */
-Route::group([], function () {
+Route::group(['middleware' => 'guest'], function () {
     // These routes are defined so that we can continue to reference them programatically.
     // They all route to the same controller function which passes off to Vuejs.
     Route::get('/login', 'LoginController@index')->name('auth.login');