diff --git a/resources/js/routes.js b/resources/js/routes.js
index c906aa9b..5b2dd3a9 100644
--- a/resources/js/routes.js
+++ b/resources/js/routes.js
@@ -88,13 +88,13 @@ router.beforeEach((to, from, next) => {
     else if (to.name.startsWith('settings.')) {
         if (to.params.returnTo == undefined) {
             if (from.params.returnTo) {
-                next({name: to.name, params: { returnTo: from.params.returnTo }})
+                next({name: to.name, params: { ...to.params, returnTo: from.params.returnTo }})
             }
             else if (from.name) {
-                next({name: to.name, params: { returnTo: from.path }})
+                next({name: to.name, params: { ...to.params, returnTo: from.path }})
             }
             else {
-                next({name: to.name, params: { returnTo: '/accounts' }})
+                next({name: to.name, params: { ...to.params, returnTo: '/accounts' }})
             }
         }
         else {
diff --git a/resources/js/views/Error.vue b/resources/js/views/Error.vue
index 99d59398..77c15b15 100644
--- a/resources/js/views/Error.vue
+++ b/resources/js/views/Error.vue
@@ -88,6 +88,14 @@
             });
 
         },
+
+        beforeRouteEnter(to, from, next) {
+            next(vm => {
+                if (from.params.returnTo) {
+                    to.params.returnTo = from.params.returnTo
+                }
+            })
+        },
     }
 
 </script>
diff --git a/resources/js/views/settings/Credentials/Edit.vue b/resources/js/views/settings/Credentials/Edit.vue
index 8c7ab2e0..7d445f7c 100644
--- a/resources/js/views/settings/Credentials/Edit.vue
+++ b/resources/js/views/settings/Credentials/Edit.vue
@@ -25,13 +25,13 @@
             }
         },
 
-        props: ['id', 'name'],
+        props: ['credentialId', 'name'],
 
         methods: {
 
             async updateCredential() {
 
-                await this.form.patch('/webauthn/credentials/' + this.id + '/name')
+                await this.form.patch('/webauthn/credentials/' + this.credentialId + '/name')
 
                 if( this.form.errors.any() === false ) {
                     this.$notify({ type: 'is-success', text: this.$t('auth.webauthn.device_successfully_registered') })
diff --git a/resources/js/views/settings/WebAuthn.vue b/resources/js/views/settings/WebAuthn.vue
index 619de454..bd09f17f 100644
--- a/resources/js/views/settings/WebAuthn.vue
+++ b/resources/js/views/settings/WebAuthn.vue
@@ -183,7 +183,7 @@
 
                 this.axios.post('/webauthn/register', publicKeyCredential, {returnError: true})
                 .then(response => {
-                    this.$router.push({ name: 'settings.webauthn.editCredential', params: { id: publicKeyCredential.id, name: this.$t('auth.webauthn.my_device') } })
+                    this.$router.push({ name: 'settings.webauthn.editCredential', params: { credentialId: publicKeyCredential.id, name: this.$t('auth.webauthn.my_device') } })
                 })
                 .catch(error => {
                     if( error.response.status === 422 ) {