diff --git a/src/routes/(auth)/signup/+page.server.ts b/src/routes/(auth)/signup/+page.server.ts
index de6ef83..cf82e36 100644
--- a/src/routes/(auth)/signup/+page.server.ts
+++ b/src/routes/(auth)/signup/+page.server.ts
@@ -86,7 +86,7 @@ export const actions: Actions = {
     } catch (e) {
       if (e instanceof LibsqlError && e.code === 'SQLITE_CONSTRAINT_UNIQUE') {
         return fail(400, {
-          message: 'Username already used',
+          message: 'Username or Email already used',
         })
       }
       console.error(e)
diff --git a/src/routes/+layout.server.ts b/src/routes/+layout.server.ts
index 25c0d99..b8e6ef8 100644
--- a/src/routes/+layout.server.ts
+++ b/src/routes/+layout.server.ts
@@ -2,5 +2,5 @@ import type { LayoutServerLoad } from './$types'
 
 export const load = (async ({ locals, url }) => {
   const { session, user } = locals
-  return { session, user, url: url.pathname }
+  return { session, user, transition_key: url.pathname }
 }) satisfies LayoutServerLoad
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 6e84db7..23c53cf 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -34,7 +34,7 @@
   <!-- <DrawerContainer> -->
   <NavBar>
     <ModalContainer />
-    <Transition {data}>
+    <Transition key={data.transition_key}>
       <slot />
     </Transition>
   </NavBar>
diff --git a/src/routes/Transition.svelte b/src/routes/Transition.svelte
index 4d6de9f..ea64b87 100644
--- a/src/routes/Transition.svelte
+++ b/src/routes/Transition.svelte
@@ -6,7 +6,7 @@
   import { onNavigate } from '$app/navigation'
   import PreLoadingIndicator from './PreLoadingIndicator.svelte'
 
-  export let data
+  export let key
 
   onNavigate(navigation => {
     // @ts-expect-error
@@ -24,7 +24,7 @@
 
 <!-- TODO: fix duplicating page bug -->
 <!-- or $navigating -->
-{#key data.url}
+{#key key}
   <div
     in:fly={{
       duration: 300,