diff --git a/src/components/application/walkthrough.vue b/src/components/application/walkthrough.vue
index eef5221a..df7ac12d 100644
--- a/src/components/application/walkthrough.vue
+++ b/src/components/application/walkthrough.vue
@@ -137,8 +137,8 @@ export default {
         if (this.$store.state.autoJoinPassword) {
           url = url + '&password=' + this.$store.state.autoJoinPassword
         }
+        url = url.replace('clientselect', 'join')
       }
-      url = url.replace('clientselect', 'join')
       return url
     },
     logo: function () {