diff --git a/apps/console/src/hooks.server.ts b/apps/console/src/hooks.server.ts
index 9b890ef3..9c329629 100644
--- a/apps/console/src/hooks.server.ts
+++ b/apps/console/src/hooks.server.ts
@@ -3,7 +3,7 @@ import { dev } from '$app/environment';
 import { FLAGS_SECRET } from '$env/static/private';
 import * as flags from '$lib/flags';
 import { i18n } from '$lib/i18n';
-import { auth, guard, houdini, theme } from '$lib/server/middleware';
+import { auth, guard, houdini, theme } from '$lib/server/hooks';
 import { Logger, sleep } from '@spectacular/utils';
 import type { Handle, HandleFetch, HandleServerError } from '@sveltejs/kit';
 import { sequence } from '@sveltejs/kit/hooks';
diff --git a/apps/console/src/lib/middleware/dead-links.ts b/apps/console/src/lib/hooks/dead-links.ts
similarity index 100%
rename from apps/console/src/lib/middleware/dead-links.ts
rename to apps/console/src/lib/hooks/dead-links.ts
diff --git a/apps/console/src/lib/server/middleware/auth.ts b/apps/console/src/lib/server/hooks/auth.ts
similarity index 100%
rename from apps/console/src/lib/server/middleware/auth.ts
rename to apps/console/src/lib/server/hooks/auth.ts
diff --git a/apps/console/src/lib/server/middleware/guard.ts b/apps/console/src/lib/server/hooks/guard.ts
similarity index 100%
rename from apps/console/src/lib/server/middleware/guard.ts
rename to apps/console/src/lib/server/hooks/guard.ts
diff --git a/apps/console/src/lib/server/middleware/houdini.ts b/apps/console/src/lib/server/hooks/houdini.ts
similarity index 100%
rename from apps/console/src/lib/server/middleware/houdini.ts
rename to apps/console/src/lib/server/hooks/houdini.ts
diff --git a/apps/console/src/lib/server/middleware/index.ts b/apps/console/src/lib/server/hooks/index.ts
similarity index 100%
rename from apps/console/src/lib/server/middleware/index.ts
rename to apps/console/src/lib/server/hooks/index.ts
diff --git a/apps/console/src/lib/server/middleware/logger.ts b/apps/console/src/lib/server/hooks/logger.ts
similarity index 100%
rename from apps/console/src/lib/server/middleware/logger.ts
rename to apps/console/src/lib/server/hooks/logger.ts
diff --git a/apps/console/src/lib/server/middleware/rate-limiter.ts b/apps/console/src/lib/server/hooks/rate-limiter.ts
similarity index 100%
rename from apps/console/src/lib/server/middleware/rate-limiter.ts
rename to apps/console/src/lib/server/hooks/rate-limiter.ts
diff --git a/apps/console/src/lib/server/middleware/redirections.ts b/apps/console/src/lib/server/hooks/redirections.ts
similarity index 100%
rename from apps/console/src/lib/server/middleware/redirections.ts
rename to apps/console/src/lib/server/hooks/redirections.ts
diff --git a/apps/console/src/lib/server/middleware/refresh-token.ts b/apps/console/src/lib/server/hooks/refresh-token.ts
similarity index 100%
rename from apps/console/src/lib/server/middleware/refresh-token.ts
rename to apps/console/src/lib/server/hooks/refresh-token.ts
diff --git a/apps/console/src/lib/server/middleware/tenant.ts b/apps/console/src/lib/server/hooks/tenant.ts
similarity index 100%
rename from apps/console/src/lib/server/middleware/tenant.ts
rename to apps/console/src/lib/server/hooks/tenant.ts
diff --git a/apps/console/src/lib/server/middleware/theme.ts b/apps/console/src/lib/server/hooks/theme.ts
similarity index 100%
rename from apps/console/src/lib/server/middleware/theme.ts
rename to apps/console/src/lib/server/hooks/theme.ts
diff --git a/apps/console/src/routes/(app)/profile/+page.gql b/apps/console/src/routes/(app)/profile/+page.gql
index 50141cc3..6299e281 100644
--- a/apps/console/src/routes/(app)/profile/+page.gql
+++ b/apps/console/src/routes/(app)/profile/+page.gql
@@ -17,7 +17,7 @@ query GetUser($userId: uuid!) @cache(policy: NetworkOnly) {
     }
     securityKeys(order_by: { nickname: asc })  @list(name: "SecurityKeys") {
       __typename
-      ...SecurityKeyFields
+      ...SecurityKeyFragment
     }
     personalAccessTokens: refreshTokens {
       id
diff --git a/apps/console/src/routes/(app)/profile/components/security-key.svelte b/apps/console/src/routes/(app)/profile/components/security-key.svelte
index 0e1c8039..269056a7 100644
--- a/apps/console/src/routes/(app)/profile/components/security-key.svelte
+++ b/apps/console/src/routes/(app)/profile/components/security-key.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { invalidateAll } from '$app/navigation';
-import type { SecurityKeyFields } from '$houdini';
+import type { SecurityKeyFragment } from '$houdini';
 import { PendingValue, RemoveSecurityKeyStore, cache, fragment, graphql } from '$houdini';
 import { handleMessage } from '$lib/components/layout/toast-manager';
 import { getNhostClient } from '$lib/stores/nhost';
@@ -16,19 +16,20 @@ const toastStore = getToastStore();
 export let message: App.Superforms.Message | undefined;
 export let errors: string[];
 
-export let securityKey: SecurityKeyFields;
-$: securityKeyFields = fragment(
+export let securityKey: SecurityKeyFragment;
+$: securityKeyFragment = fragment(
   securityKey,
   graphql`
-    fragment SecurityKeyFields on authUserSecurityKeys {
+    fragment SecurityKeyFragment on authUserSecurityKeys {
       id
       nickname
     }
   `,
 );
 
-$: ({ id, nickname } = $securityKeyFields);
-//  $: loading = $securityKeyFields.__typename === PendingValue;
+$: ({ id, nickname } = $securityKeyFragment);
+
+//  $: loading = $securityKeyFragment.__typename === PendingValue;
 
 /**
  * delete handler
diff --git a/apps/console/src/routes/(auth)/signin/+page.svelte b/apps/console/src/routes/(auth)/signin/+page.svelte
index c73835a8..b6234a4d 100644
--- a/apps/console/src/routes/(auth)/signin/+page.svelte
+++ b/apps/console/src/routes/(auth)/signin/+page.svelte
@@ -13,7 +13,11 @@ export let data;
 </svelte:head>
 
 <PasswordSigninForm />
+{#if data.flags.showMagicLink}
 <Divider>Or</Divider>
 <PasswordlessSigninForm />
+{/if}
+{#if data.flags.showSocial}
 <Divider>Or continue with</Divider>
 <SocialSigninForm />
+{/if}