diff --git a/src/resources/vue/App.vue b/src/resources/vue/App.vue
index 1bd7e64e..6f7fff9e 100644
--- a/src/resources/vue/App.vue
+++ b/src/resources/vue/App.vue
@@ -1,129 +1,131 @@
 <template>
     <router-view v-if="!isLoading && !routerReloading && key" :key="key" @hook:mounted="childMounted"></router-view>
 </template>
 
 <script>
     export default {
         data() {
             return {
                 isLoading: true,
                 routerReloading: false
             }
         },
         computed: {
             key() {
                 // Display 403 error page if the current user has no permission to a specified page
                 // Note that it's the only place I found that allows us to do this.
                 if (this.$route.meta.perm && !this.checkPermission(this.$route.meta.perm)) {
                     // Returning false here will block the page component from execution,
                     // as we're using the key in v-if condition on the router-view above
                     return false
                 }
 
                 // The 'key' property is used to reload the Page component
                 // whenever a route changes. Normally vue does not do that.
                 return this.$route.name == '404' ? this.$route.path : 'static'
             }
         },
         mounted() {
             const token = localStorage.getItem('token')
 
             if (token) {
                 this.$root.startLoading()
                 axios.defaults.headers.common.Authorization = 'Bearer ' + token
 
-                axios.post('/api/auth/info?refresh=1', {refresh_token: localStorage.getItem("refreshToken")})
+                const post = { refresh_token: localStorage.getItem("refreshToken") }
+
+                axios.post('/api/auth/info?refresh=1', post, { ignoreErrors: true })
                     .then(response => {
                         this.$root.loginUser(response.data, false)
                         this.$root.stopLoading()
                         this.isLoading = false
                     })
                     .catch(error => {
                         // Release lock on the router-view, otherwise links (e.g. Logout) will not work
                         this.isLoading = false
                         // Handle the error, on 401 display the logon page
                         this.$root.errorHandler(error)
                     })
             } else {
                 this.isLoading = false
             }
         },
         methods: {
             checkPermission(type) {
                 if (this.$root.hasPermission(type)) {
                     return true
                 }
 
                 const hint = type == 'wallets' ? this.$t('wallet.noperm') : ''
 
                 this.$root.errorPage(403, null, hint)
 
                 return false
             },
             childMounted() {
                 this.$root.updateBodyClass()
                 this.getFAQ()
                 this.degradedWarning()
             },
             degradedWarning() {
                 // Display "Account Degraded" warning on all pages
                 if (this.$root.isDegraded()) {
                     let message = this.$t('user.degraded-warning')
 
                     if (this.$store.state.authInfo.isDegraded) {
                         message += ' ' + this.$t('user.degraded-hint')
                     }
 
                     const html = `<div id="status-degraded" class="d-flex justify-content-center">`
                         + `<p class="alert alert-danger">${message}</p></div>`
 
                     $('#app > div.container').prepend(html)
                 }
             },
             getFAQ() {
                 let page = this.$route.path
 
                 if (page == '/' || page == '/login') {
                     return
                 }
 
                 axios.get('/content/faq' + page, { ignoreErrors: true })
                     .then(response => {
                         const result = response.data.faq
                         $('#faq').remove()
                         if (result && result.length) {
                             let faq = $('<div id="faq" class="faq mt-3"><h5>' + this.$t('app.faq') + '</h5><ul class="pl-4"></ul></div>')
                             let list = $([])
 
                             result.forEach(item => {
                                 let li = $('<li>').append($('<a>').attr('href', item.href).text(item.title))
 
                                 // Handle internal links with the vue-router
                                 if (item.href.charAt(0) == '/') {
                                     li.find('a').on('click', event => {
                                         event.preventDefault()
                                         this.$router.push(item.href)
                                     })
                                 }
 
                                 list = list.add(li)
                             })
 
                             faq.find('ul').append(list)
 
                             $(this.$el).append(faq)
                         }
                     })
             },
             routerReload() {
                 // Together with beforeRouteUpdate even on a route component
                 // allows us to force reload the component. So it is possible
                 // to jump from/to page that uses currently loaded component.
                 this.routerReloading = true
                 this.$nextTick().then(() => {
                     this.routerReloading = false
                 })
             }
         }
     }
 </script>
diff --git a/src/resources/vue/Login.vue b/src/resources/vue/Login.vue
index a8ca65fe..9c162b35 100644
--- a/src/resources/vue/Login.vue
+++ b/src/resources/vue/Login.vue
@@ -1,73 +1,73 @@
 <template>
     <div class="container d-flex flex-column align-items-center justify-content-center">
         <div id="logon-form" class="card col-sm-8 col-lg-6">
             <div class="card-body p-4">
                 <h1 class="card-title text-center mb-3">{{ $t('login.header') }}</h1>
                 <div class="card-text m-2 mb-0">
                     <form class="form-signin" @submit.prevent="submitLogin">
                         <div class="row mb-3">
                             <label for="inputEmail" class="visually-hidden">{{ $t('form.email') }}</label>
                             <div class="input-group">
                                 <span class="input-group-text"><svg-icon icon="user"></svg-icon></span>
                                 <input type="email" id="inputEmail" class="form-control" :placeholder="$t('form.email')" required autofocus v-model="email">
                             </div>
                         </div>
                         <div class="row mb-4">
                             <label for="inputPassword" class="visually-hidden">{{ $t('form.password') }}</label>
                             <div class="input-group">
                                 <span class="input-group-text"><svg-icon icon="lock"></svg-icon></span>
                                 <input type="password" id="inputPassword" class="form-control" :placeholder="$t('form.password')" required v-model="password">
                             </div>
                         </div>
                         <div class="row mb-3" v-if="$root.isUser">
                             <label for="secondfactor" class="visually-hidden">{{ $t('login.2fa') }}</label>
                             <div class="input-group">
                                 <span class="input-group-text"><svg-icon icon="key"></svg-icon></span>
                                 <input type="text" id="secondfactor" class="form-control" :placeholder="$t('login.2fa')" v-model="secondFactor">
                             </div>
                             <small class="text-muted mt-2">{{ $t('login.2fa_desc') }}</small>
                         </div>
                         <div class="text-center">
                             <btn class="btn-primary" type="submit" icon="sign-in-alt">{{ $t('login.sign_in') }}</btn>
                         </div>
                     </form>
                 </div>
             </div>
         </div>
         <div id="logon-form-footer" class="mt-1">
             <router-link v-if="$root.isUser && $root.hasRoute('password-reset')" :to="{ name: 'password-reset' }" id="forgot-password">{{ $t('login.forgot_password') }}</router-link>
             <a v-if="webmailURL && $root.isUser" :href="webmailURL" id="webmail">{{ $t('login.webmail') }}</a>
         </div>
     </div>
 </template>
 
 <script>
     export default {
         props: {
             dashboard: { type: Boolean, default: true }
         },
         data() {
             return {
                 email: '',
                 password: '',
                 secondFactor: '',
                 webmailURL: window.config['app.webmail_url']
             }
         },
         methods: {
             submitLogin() {
                 this.$root.clearFormValidation($('form.form-signin'))
 
-                axios.post('/api/auth/login', {
-                    email: this.email,
-                    password: this.password,
-                    secondfactor: this.secondFactor
-                }).then(response => {
-                    // login user and redirect to dashboard
-                    this.$root.loginUser(response.data, this.dashboard)
-                    this.$emit('success')
-                })
+                const post = this.$root.pick(this, ['email', 'password', 'secondFactor'])
+
+                axios.post('/api/auth/login', post)
+                    .then(response => {
+                        // login user and redirect to dashboard
+                        this.$root.loginUser(response.data, this.dashboard)
+                        this.$emit('success')
+                    })
+                    .catch(e => {})
             }
         }
     }
 </script>