diff --git a/ceremony/src/lib/stores/state.svelte.ts b/ceremony/src/lib/stores/state.svelte.ts
index efedf64be6..65218f20b9 100644
--- a/ceremony/src/lib/stores/state.svelte.ts
+++ b/ceremony/src/lib/stores/state.svelte.ts
@@ -15,7 +15,7 @@ type State =
   | "offline"
   | "noClient"
 
-export type AllowanceState = "invited" | "waitingList" | undefined
+export type AllowanceState = "invited" | "waitingList" | "join" | undefined
 
 export type ContributionState = "contribute" | "contributed" | "verifying" | "notContributed"
 
diff --git a/ceremony/src/lib/supabase/index.ts b/ceremony/src/lib/supabase/index.ts
index 16c528b869..73def46164 100644
--- a/ceremony/src/lib/supabase/index.ts
+++ b/ceremony/src/lib/supabase/index.ts
@@ -104,7 +104,7 @@ export const getContributionState = async (): Promise<ContributionState> => {
 export const getAllowanceState = async (userId: string | undefined): Promise<AllowanceState> => {
   if (!userId) {
     console.log("Need to be logged in to get allowance state")
-    return
+    return undefined
   }
 
   const { data, error } = await queryAllowance()
@@ -113,5 +113,5 @@ export const getAllowanceState = async (userId: string | undefined): Promise<All
   if (data.in_waitlist) return "waitingList"
   if (data.has_redeemed) return "invited"
 
-  return undefined
+  return "join"
 }
diff --git a/ceremony/src/routes/+page.svelte b/ceremony/src/routes/+page.svelte
index 28ae7a1e92..d53335c29c 100644
--- a/ceremony/src/routes/+page.svelte
+++ b/ceremony/src/routes/+page.svelte
@@ -4,30 +4,28 @@ import H1 from "$lib/components/typography/H1.svelte"
 import { ContributorState } from "$lib/stores/state.svelte.ts"
 import Ceremony from "$lib/components/Ceremony.svelte"
 import Join from "$lib/components/Join.svelte"
+import Spinner from "$lib/components/Spinner.svelte"
 
-//Improvements
-//Only start polling depending on allowance, no need to poll if not allowed.
-//
-
-//This could be set with context API if we expand the app a lot.
 let contributor: ContributorState = new ContributorState()
 
-$effect(() => {
+$effect.pre(() => {
   const userId = user.session?.user.id
   if (userId) contributor.setUserId(userId)
 })
 </script>
 
-<!--Maybe add loading state to handle text jump-->
+<!--Fix jump between state on load-->
 {#if contributor.loggedIn}
-  {#if contributor.allowanceState === "invited"}
+  {#if !contributor.allowanceState}
+    <Spinner class="text-union-accent-500 size-6"/>
+  {:else if contributor.allowanceState === "invited"}
     <Ceremony {contributor}/>
   {:else if contributor.allowanceState === "waitingList"}
-    <H1>Your on the list</H1>
-  {:else}
+    <H1>You're on the list</H1>
+  {:else if contributor.allowanceState === "join"}
     <Join {contributor}/>
   {/if}
 {:else}
-  <H1>Welcome to union ceremony</H1>
+  <H1>Welcome to the union ceremony</H1>
 {/if}
 
diff --git a/ceremony/src/routes/auth/register/+page.svelte b/ceremony/src/routes/auth/register/+page.svelte
index d773e428b2..fd64ea7b90 100644
--- a/ceremony/src/routes/auth/register/+page.svelte
+++ b/ceremony/src/routes/auth/register/+page.svelte
@@ -12,7 +12,7 @@ let loading = false
 
 async function register() {
   loading = true
-  await auth(`${$page.url.origin}/app`)
+  await auth(`${$page.url.origin}/`)
 }
 </script>