merge develop, fix conflicts, fix logged out bug

1 files changed, 2 insertions, 2 deletions

diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index dd8e6e5d..ab6cd64d 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -28,7 +28,7 @@ const registration = {
   },
   created () {
     if ((!this.registrationOpen && !this.token) || this.signedIn) {
-      this.$router.push('/~/main/all')
+      this.$router.push({name: 'root'})
     }
 
     this.setCaptcha()
@@ -58,7 +58,7 @@ const registration = {
       if (!this.$v.$invalid) {
         try {
           await this.signUp(this.user)
-          this.$router.push('/~/main/friends')
+          this.$router.push({name: 'friends'})
         } catch (error) {
           console.warn('Registration failed: ' + error)
         }