diff --git a/components/nav/NavUser.vue b/components/nav/NavUser.vue
index 021dce0b..f69362a9 100644
--- a/components/nav/NavUser.vue
+++ b/components/nav/NavUser.vue
@@ -26,28 +26,22 @@ const { busy, oauth, singleInstanceServer } = useSignIn()
       :disabled="busy"
       @click="oauth('signup')"
     >
-      hey
       <span v-if="busy" aria-hidden="true" block animate animate-spin preserve-3d class="rtl-flip">
         <span block i-ri:loader-2-fill aria-hidden="true" />
       </span>
-      <span v-else aria-hidden="true" block i-ri:login-circle-line class="rtl-flip" />
       {{ $t('action.sign_up') }}
     </button>
     <button
       v-if="singleInstanceServer"
       flex="~ row"
-      gap-x-1 items-center justify-center btn-solid text-sm px-2 py-1 xl:hidden
+      gap-x-1 items-center justify-center btn-outline text-sm px-2 py-1 xl:hidden
       :disabled="busy"
-      @click="oauth('signin')"
+      @click="oauth('login')"
     >
-      hey
       <span v-if="busy" aria-hidden="true" block animate animate-spin preserve-3d class="rtl-flip">
         <span block i-ri:loader-2-fill aria-hidden="true" />
       </span>
-      <span v-else aria-hidden="true" block i-ri:login-circle-line class="rtl-flip" />
-      <i18n-t keypath="action.sign_in_to">
-        <strong>{{ currentServer }}</strong>
-      </i18n-t>
+      {{ $t('action.sign_in') }}
     </button>
     <button v-else btn-solid text-sm px-2 py-1 text-center xl:hidden @click="openSigninDialog()">
       {{ $t('action.sign_in') }}
diff --git a/components/user/UserSignInEntry.vue b/components/user/UserSignInEntry.vue
index 62c2ff0c..fb7605f3 100644
--- a/components/user/UserSignInEntry.vue
+++ b/components/user/UserSignInEntry.vue
@@ -23,7 +23,6 @@ const { busy, oauth, singleInstanceServer } = useSignIn()
       <span v-if="busy" aria-hidden="true" block animate animate-spin preserve-3d class="rtl-flip">
         <span block i-ri:loader-2-fill aria-hidden="true" />
       </span>
-      <span v-else aria-hidden="true" block i-ri:login-circle-line class="rtl-flip" />
       {{ $t('action.sign_up') }}
     </button>
     <button
@@ -35,7 +34,6 @@ const { busy, oauth, singleInstanceServer } = useSignIn()
       <span v-if="busy" aria-hidden="true" block animate animate-spin preserve-3d class="rtl-flip">
         <span block i-ri:loader-2-fill aria-hidden="true" />
       </span>
-      <span v-else aria-hidden="true" block i-ri:login-circle-line class="rtl-flip" />
       {{ $t('action.sign_in') }}
     </button>
     <button v-else btn-solid rounded-3 text-center mt-2 select-none @click="openSigninDialog()">
diff --git a/locales/en.json b/locales/en.json
index 5af9bb95..7d435f5c 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -81,7 +81,7 @@
     "save_changes": "Save changes",
     "sign_in": "Sign in",
     "sign_in_to": "Sign in to {0}",
-    "sign_up": "Sign up",
+    "sign_up": "Create an account",
     "switch_account": "Switch account",
     "vote": "Vote"
   },
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 7d00631a..2dd7e953 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -162,7 +162,7 @@ export default defineNuxtConfig({
       // our default translation server #76
       translateApi: '',
       // Use the instance where Elk has its Mastodon account as the default
-      defaultServer: 'social.ayco.io',
+      defaultServer: 'mastodon.social',
       singleInstance: true,
     },
     storage: {
diff --git a/server/api/[server]/signup.ts b/server/api/[server]/signup.ts
index ec193959..69a0fe2e 100644
--- a/server/api/[server]/signup.ts
+++ b/server/api/[server]/signup.ts
@@ -2,7 +2,7 @@ import { stringifyQuery } from 'ufo'
 
 export default defineEventHandler(async (event) => {
   let { server } = getRouterParams(event)
-  const { origin, force_login, lang } = await readBody(event)
+  const { origin } = await readBody(event)
   server = server.toLocaleLowerCase().trim()
   const app = await getApp(origin, server)
 
@@ -13,14 +13,5 @@ export default defineEventHandler(async (event) => {
     })
   }
 
-  const query = stringifyQuery({
-    client_id: app.client_id,
-    force_login: force_login === true ? 'true' : 'false',
-    scope: 'read write follow push',
-    response_type: 'code',
-    lang,
-    redirect_uri: getRedirectURI(origin, server),
-  })
-
-  return `https://${server}/oauth/authorize?${query}`
+  return `https://${server}/auth/sign_up`
 })