diff --git a/src/components/app/Popouts/Popouts/AddServer.vue b/src/components/app/Popouts/Popouts/AddServer.vue
index 6ea29cb..d322008 100644
--- a/src/components/app/Popouts/Popouts/AddServer.vue
+++ b/src/components/app/Popouts/Popouts/AddServer.vue
@@ -71,17 +71,6 @@
           />
           <div class="server-name">{{ server.name }}</div>
           <div class="buttons">
-            <div
-              class="button cancel-button"
-              @click="
-                server = null;
-                inviteCode = '';
-                tab = 1;
-                slideBack();
-              "
-            >
-              Cancel
-            </div>
             <div
               v-if="!servers[server.server_id]"
               class="button join-button"
@@ -95,6 +84,17 @@
             >
               Joined
             </div>
+            <div
+              class="button cancel-button"
+              @click="
+                server = null;
+                inviteCode = '';
+                tab = 1;
+                slideBack();
+              "
+            >
+              Cancel
+            </div>
           </div>
         </div>
       </transition-group>
diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue
index beb2531..0fb8d1e 100644
--- a/src/views/LoginPage.vue
+++ b/src/views/LoginPage.vue
@@ -48,18 +48,18 @@
                 >{{ otherError }}</span
               >
               <div class="buttons">
-                <button
-                  class="button register-button"
-                  @click.prevent="registerButton"
-                >
-                  I'm new!
-                </button>
                 <button
                   type="submit"
                   :class="{ button: true, deactive: deactive }"
                 >
                   Login
                 </button>
+                <button
+                  class="button register-button"
+                  @click.prevent="registerButton"
+                >
+                  I'm new!
+                </button>
               </div>
             </form>
             <div v-if="showCaptcha" class="captcha-box">
diff --git a/src/views/RegisterPage.vue b/src/views/RegisterPage.vue
index eb00ac7..eb06e30 100644
--- a/src/views/RegisterPage.vue
+++ b/src/views/RegisterPage.vue
@@ -70,18 +70,18 @@
                 >{{ otherError }}</span
               >
               <div class="buttons">
-                <button
-                  class="button register-button"
-                  @click.prevent="loginButton"
-                >
-                  I'm already a user!
-                </button>
                 <button
                   type="submit"
                   :class="{ button: true, deactive: deactive }"
                 >
                   Register
                 </button>
+                <button
+                  class="button register-button"
+                  @click.prevent="loginButton"
+                >
+                  I'm already a user!
+                </button>
               </div>
             </form>
             <div v-if="showCaptcha" class="captcha-box">