diff --git a/.changeset/four-peaches-bake.md b/.changeset/four-peaches-bake.md
new file mode 100644
index 0000000000..fc3d4577a2
--- /dev/null
+++ b/.changeset/four-peaches-bake.md
@@ -0,0 +1,5 @@
+---
+"@graphcommerce/magento-cart": patch
+---
+
+When signing in the cartFab would not always properly reflect the current items in the cart
diff --git a/.changeset/quiet-boats-leave.md b/.changeset/quiet-boats-leave.md
new file mode 100644
index 0000000000..c16a80afef
--- /dev/null
+++ b/.changeset/quiet-boats-leave.md
@@ -0,0 +1,6 @@
+---
+'@graphcommerce/magento-customer': patch
+'@graphcommerce/magento-cart': patch
+---
+
+Added user session reevaluation after unathenticated call. Queries will be paused untill user has signed in again
diff --git a/.changeset/rude-bags-draw.md b/.changeset/rude-bags-draw.md
new file mode 100644
index 0000000000..9476e457b3
--- /dev/null
+++ b/.changeset/rude-bags-draw.md
@@ -0,0 +1,5 @@
+---
+"@graphcommerce/magento-customer": patch
+---
+
+Created a debug.sessions config that allows debugging sessions. Enable with GC_DEBUG_SESSIONS=1 in your env or modify your graphcommerce.config.js
diff --git a/.gitignore b/.gitignore
index 74170c4c4f..8d68207d37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 # dependencies
 node_modules
+/.pnp
+.pnp.js
+.swc
 
 # testing
 /coverage
diff --git a/docs/framework/config.md b/docs/framework/config.md
index 8979e76fc0..2f8ecf2865 100644
--- a/docs/framework/config.md
+++ b/docs/framework/config.md
@@ -311,6 +311,10 @@ Debug configuration for GraphCommerce
 
 Reports which plugins are enabled or disabled.
 
+#### sessions: boolean
+
+Enable debugging interface to debug sessions
+
 #### webpackCircularDependencyPlugin: boolean
 
 Cyclic dependencies can cause memory issues and other strange bugs.
diff --git a/packages/magento-cart/hooks/UseMergeCustomerCart.graphql b/packages/magento-cart/hooks/UseMergeCustomerCart.graphql
index 0f135dc187..2ffb7fc8ad 100644
--- a/packages/magento-cart/hooks/UseMergeCustomerCart.graphql
+++ b/packages/magento-cart/hooks/UseMergeCustomerCart.graphql
@@ -2,5 +2,6 @@ mutation UseMergeCustomerCart($sourceCartId: String!, $destinationCartId: String
   mergeCarts(source_cart_id: $sourceCartId, destination_cart_id: $destinationCartId) {
     __typename
     id
+    ...CartItemCountChanged
   }
 }
diff --git a/packages/magento-cart/link/createCartErrorLink.ts b/packages/magento-cart/link/createCartErrorLink.ts
index 4c859699f9..b86ae4e00a 100644
--- a/packages/magento-cart/link/createCartErrorLink.ts
+++ b/packages/magento-cart/link/createCartErrorLink.ts
@@ -26,10 +26,6 @@ export const cartErrorLink = onError(({ graphQLErrors, operation, forward }) =>
   const isErrorCategory = (err: GraphQLError, category: ErrorCategory) =>
     err.extensions?.category === category
 
-  const isAuthorizationError = (err: GraphQLError) =>
-    isErrorCategory(err, 'graphql-authorization') &&
-    errorIsIncluded(err.path, ['addProductsToCart'])
-
   const isNoSuchEntityError = (err: GraphQLError) =>
     isErrorCategory(err, 'graphql-no-such-entity') &&
     errorIsIncluded(err.path, [
@@ -49,7 +45,7 @@ export const cartErrorLink = onError(({ graphQLErrors, operation, forward }) =>
       // 'applyCouponToCart',
       // 'removeCouponFromCart'
     ])
-  const cartErr = graphQLErrors.find((err) => isNoSuchEntityError(err) || isAuthorizationError(err))
+  const cartErr = graphQLErrors.find((err) => isNoSuchEntityError(err))
 
   if (!cartErr) return undefined
 
diff --git a/packages/magento-customer/Config.graphqls b/packages/magento-customer/Config.graphqls
index 24557497f6..f665860d89 100644
--- a/packages/magento-customer/Config.graphqls
+++ b/packages/magento-customer/Config.graphqls
@@ -19,3 +19,10 @@ extend input GraphCommerceConfig {
   """
   enableGuestCheckoutLogin: Boolean
 }
+
+extend input GraphCommerceDebugConfig {
+  """
+  Enable debugging interface to debug sessions
+  """
+  sessions: Boolean
+}
diff --git a/packages/magento-customer/components/AccountSignInUpForm/AccountSignInUpForm.tsx b/packages/magento-customer/components/AccountSignInUpForm/AccountSignInUpForm.tsx
index d3380015dc..2b930dd200 100644
--- a/packages/magento-customer/components/AccountSignInUpForm/AccountSignInUpForm.tsx
+++ b/packages/magento-customer/components/AccountSignInUpForm/AccountSignInUpForm.tsx
@@ -1,7 +1,7 @@
-import { TextFieldElement, emailPattern } from '@graphcommerce/ecommerce-ui'
+import { FormAutoSubmit, TextFieldElement, emailPattern } from '@graphcommerce/ecommerce-ui'
+import { useApolloClient } from '@graphcommerce/graphql'
 import {
   ActionCard,
-  ActionCardLayout,
   ActionCardListForm,
   Button,
   FormActions,
@@ -13,11 +13,11 @@ import {
 import { Trans } from '@lingui/react'
 import { Box, CircularProgress, Link, SxProps, Theme, Typography } from '@mui/material'
 import { useRouter } from 'next/router'
-import { useEffect } from 'react'
-import { CustomerDocument, useFormIsEmailAvailable } from '../../hooks'
+import { CustomerDocument, useAccountSignInUpForm } from '../../hooks'
 import { useCustomerQuery } from '../../hooks/useCustomerQuery'
 import { ApolloCustomerErrorAlert } from '../ApolloCustomerError'
 import { SignInForm } from '../SignInForm/SignInForm'
+import { signOut } from '../SignOutForm/signOut'
 import { SignUpForm } from '../SignUpForm/SignUpForm'
 
 export type AccountSignInUpFormProps = { sx?: SxProps<Theme> }
@@ -25,96 +25,87 @@ export type AccountSignInUpFormProps = { sx?: SxProps<Theme> }
 const parts = ['root', 'titleContainer'] as const
 const { classes } = extendableComponent('AccountSignInUpForm', parts)
 
-const titleContainerSx: SxProps<Theme> = (theme) => ({
-  typography: 'body1',
-  marginBottom: theme.spacings.xs,
-})
-
 export function AccountSignInUpForm(props: AccountSignInUpFormProps) {
   const { sx = [] } = props
   const customerQuery = useCustomerQuery(CustomerDocument)
 
   const { email, firstname = '' } = customerQuery.data?.customer ?? {}
 
-  const { mode, form, autoSubmitting, submit } = useFormIsEmailAvailable({ email })
+  const { mode, form, submit } = useAccountSignInUpForm()
   const { formState, watch, control, error } = form
-  const disableFields = formState.isSubmitting && !autoSubmitting
-
-  const { setValue, trigger } = form
   const router = useRouter()
-  useEffect(() => {
-    const emailFromParams = router.query.email as string
-    if (!email && emailFromParams) {
-      setValue('email', emailFromParams)
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      trigger('email')
-    }
-  }, [email, router.query.email, setValue, trigger])
+
+  const client = useApolloClient()
 
   return (
     <FormDiv sx={sx} className={classes.root}>
-      {mode === 'email' && (
-        <Box className={classes.titleContainer} sx={titleContainerSx}>
-          <LayoutTitle variant='h2' gutterBottom={false}>
-            <Trans id='Sign in or create an account!' />
-          </LayoutTitle>
-          <Typography variant='h6' align='center'>
-            <Trans id='Fill in your e-mail to login or create an account' />
-          </Typography>
-        </Box>
-      )}
+      <Box
+        className={classes.titleContainer}
+        sx={(theme) => ({ typography: 'body1', marginBottom: theme.spacings.xs })}
+      >
+        {mode === 'email' && (
+          <>
+            <LayoutTitle variant='h2' gutterBottom={false}>
+              <Trans id='Sign in or create an account!' />
+            </LayoutTitle>
+            <Typography variant='h6' align='center'>
+              <Trans id='Fill in your e-mail to login or create an account' />
+            </Typography>
+          </>
+        )}
 
-      {mode === 'signin' && (
-        <Box className={classes.titleContainer} sx={titleContainerSx}>
-          <LayoutTitle variant='h2' gutterBottom={false}>
-            <Trans id='Welcome back!' />
-          </LayoutTitle>
-          <Typography variant='h6' align='center'>
-            <Trans id='Fill in your password' />
-          </Typography>
-        </Box>
-      )}
+        {mode === 'signin' && (
+          <>
+            <LayoutTitle variant='h2' gutterBottom={false}>
+              <Trans id='Sign in' />
+            </LayoutTitle>
+            <Typography variant='h6' align='center'>
+              <Trans id='Fill in your password' />
+            </Typography>
+          </>
+        )}
 
-      {mode === 'signup' && (
-        <Box className={classes.titleContainer} sx={titleContainerSx}>
-          <LayoutTitle variant='h2' gutterBottom={false}>
-            <Trans id='Create account!' />
-          </LayoutTitle>
-          <Typography variant='h6' align='center'>
-            <Trans id='Create a password and tell us your name' />
-          </Typography>
-        </Box>
-      )}
+        {mode === 'signup' && (
+          <>
+            <LayoutTitle variant='h2' gutterBottom={false}>
+              <Trans id='Create account!' />
+            </LayoutTitle>
+            <Typography variant='h6' align='center'>
+              <Trans id='Create a password and tell us your name' />
+            </Typography>
+          </>
+        )}
 
-      {mode === 'signedin' && (
-        <Box className={classes.titleContainer} sx={titleContainerSx}>
-          <LayoutTitle variant='h2' gutterBottom={false}>
-            <Trans id='Hi {firstname}! You’re now logged in!' values={{ firstname }} />
-          </LayoutTitle>
-          <Typography variant='h6' align='center'>
-            <Link href='/account' underline='hover' color='secondary'>
-              <Trans id='View your account' />
-            </Link>
-          </Typography>
-
-          <FormActions>
-            <Button onClick={() => router.back()} variant='pill' color='secondary' size='large'>
-              <Trans id='Continue shopping' />
-            </Button>
-          </FormActions>
-        </Box>
-      )}
+        {mode === 'signedin' && (
+          <>
+            <LayoutTitle variant='h2' gutterBottom={false}>
+              <Trans id='Hi {firstname}! You’re now logged in!' values={{ firstname }} />
+            </LayoutTitle>
+            <Typography variant='h6' align='center'>
+              <Link href='/account' underline='hover' color='secondary'>
+                <Trans id='View your account' />
+              </Link>
+            </Typography>
+
+            <FormActions>
+              <Button onClick={() => router.back()} variant='pill' color='secondary' size='large'>
+                <Trans id='Continue shopping' />
+              </Button>
+            </FormActions>
+          </>
+        )}
 
-      {mode === 'session-expired' && (
-        <Box className={classes.titleContainer} sx={titleContainerSx}>
-          <LayoutTitle variant='h2' gutterBottom={false}>
-            <Trans id='Your session is expired' />
-          </LayoutTitle>
-          <Typography variant='h6' align='center'>
-            <Trans id='Log in to continue shopping' />
-          </Typography>
-        </Box>
-      )}
+        {mode === 'session-expired' && (
+          <>
+            <LayoutTitle variant='h2' gutterBottom={false}>
+              <Trans id='Your session is expired' />
+            </LayoutTitle>
+            <Typography variant='h6' align='center'>
+              <Trans id='Log in to continue shopping' />
+            </Typography>
+          </>
+        )}
+      </Box>
 
       {!import.meta.graphCommerce.enableGuestCheckoutLogin &&
         (mode === 'signin' || mode === 'signup' || mode === 'email') && (
@@ -144,6 +135,7 @@ export function AccountSignInUpForm(props: AccountSignInUpFormProps) {
 
       {mode !== 'signedin' && (
         <form onSubmit={submit}>
+          <FormAutoSubmit {...form} submit={submit} />
           <Box>
             <FormRow>
               <TextFieldElement
@@ -158,11 +150,25 @@ export function AccountSignInUpForm(props: AccountSignInUpFormProps) {
                 }}
                 error={formState.isSubmitted && !!formState.errors.email}
                 label={<Trans id='Email' />}
-                disabled={disableFields}
                 InputProps={{
-                  endAdornment: formState.isSubmitting && (
-                    <CircularProgress sx={{ display: 'inline-flex' }} />
-                  ),
+                  endAdornment:
+                    mode === 'session-expired' ? (
+                      <Button
+                        type='submit'
+                        variant='inline'
+                        color='primary'
+                        loading={formState.isSubmitting}
+                        sx={{ whiteSpace: 'nowrap' }}
+                        onClick={() => {
+                          signOut(client)
+                          form.resetField('email')
+                        }}
+                      >
+                        <Trans id='Sign out' />
+                      </Button>
+                    ) : (
+                      formState.isSubmitting && <CircularProgress sx={{ display: 'inline-flex' }} />
+                    ),
                   readOnly: !!email,
                 }}
               />
@@ -171,7 +177,7 @@ export function AccountSignInUpForm(props: AccountSignInUpFormProps) {
 
           <ApolloCustomerErrorAlert error={error} />
 
-          {(mode === 'email' || mode === 'session-expired') && (
+          {mode === 'email' && (
             <Box>
               <FormActions>
                 <Button
@@ -189,7 +195,7 @@ export function AccountSignInUpForm(props: AccountSignInUpFormProps) {
         </form>
       )}
 
-      {mode === 'signin' && (
+      {(mode === 'signin' || mode === 'session-expired') && (
         <Box>
           <SignInForm email={watch('email')} />
         </Box>
diff --git a/packages/magento-customer/components/CustomerFab/CustomerFab.tsx b/packages/magento-customer/components/CustomerFab/CustomerFab.tsx
index 9cebc91081..e63b4e3ad8 100644
--- a/packages/magento-customer/components/CustomerFab/CustomerFab.tsx
+++ b/packages/magento-customer/components/CustomerFab/CustomerFab.tsx
@@ -8,7 +8,6 @@ import { i18n } from '@lingui/core'
 import { Fab, FabProps as FabPropsType, NoSsr, SxProps, Theme } from '@mui/material'
 import React from 'react'
 import { useCustomerSession, UseCustomerSessionReturn } from '../../hooks'
-import { useCustomerValidateToken } from '../../hooks/useCustomerValidateToken'
 
 type CustomerFabContentProps = {
   icon?: React.ReactNode
@@ -28,7 +27,7 @@ function CustomerFabContent(props: CustomerFabContentProps) {
 
   return (
     <Fab
-      href={session?.requireAuth ? guestHref : authHref}
+      href={session?.loggedIn ? authHref : guestHref}
       color='inherit'
       id='account'
       aria-label={i18n._(/* i18n */ 'Account')}
@@ -54,8 +53,6 @@ export type CustomerFabProps = Omit<CustomerFabContentProps, 'session'>
 export function CustomerFab(props: CustomerFabProps) {
   const session = useCustomerSession()
 
-  useCustomerValidateToken()
-
   return (
     <NoSsr fallback={<CustomerFabContent {...props} />}>
       <CustomerFabContent session={session} {...props} />
diff --git a/packages/magento-customer/components/CustomerMenuFabItem/CustomerMenuFabItem.tsx b/packages/magento-customer/components/CustomerMenuFabItem/CustomerMenuFabItem.tsx
index 4ba7018230..6d2db8b2b7 100644
--- a/packages/magento-customer/components/CustomerMenuFabItem/CustomerMenuFabItem.tsx
+++ b/packages/magento-customer/components/CustomerMenuFabItem/CustomerMenuFabItem.tsx
@@ -30,7 +30,7 @@ function CustomerMenuFabItemContent(props: CustomerMenuFabItemProps) {
           {icon ?? <IconSvg src={iconPerson} size='medium' />}
         </Badge>
       }
-      href={session?.requireAuth ? guestHref : authHref}
+      href={session?.loggedIn ? authHref : guestHref}
     >
       {children}
     </MenuFabSecondaryItem>
diff --git a/packages/magento-customer/components/SessionDebugger/SessionDebugger.tsx b/packages/magento-customer/components/SessionDebugger/SessionDebugger.tsx
deleted file mode 100644
index 2b28fbc95f..0000000000
--- a/packages/magento-customer/components/SessionDebugger/SessionDebugger.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-/* eslint-disable no-console */
-import { useApolloClient } from '@graphcommerce/graphql'
-import { Button } from '@mui/material'
-import { CustomerTokenDocument } from '../../hooks/CustomerToken.gql'
-
-export function SessionDebugger() {
-  const client = useApolloClient()
-
-  return (
-    <div style={{ position: 'fixed', bottom: 0, right: 0, zIndex: 1, opacity: 0.3 }}>
-      <Button
-        type='button'
-        variant='text'
-        size='small'
-        onClick={() => {
-          const currentToken = client.readQuery({ query: CustomerTokenDocument })
-          if (!currentToken?.customerToken?.token) {
-            console.log('No customerToken available, nothing to break')
-          } else {
-            console.log(`Invalidating session`)
-            client.writeQuery({
-              query: CustomerTokenDocument,
-              data: {
-                customerToken: {
-                  ...currentToken?.customerToken,
-                  valid: false,
-                },
-              },
-              broadcast: true,
-            })
-          }
-        }}
-      >
-        Invalidate session
-      </Button>
-      <Button
-        type='button'
-        variant='text'
-        size='small'
-        onClick={() => {
-          const currentToken = client.readQuery({ query: CustomerTokenDocument })
-          if (!currentToken?.customerToken?.token) {
-            console.log('No customerToken available, nothing to break')
-          } else {
-            console.log(`Changing current token to a random one`)
-
-            client.writeQuery({
-              query: CustomerTokenDocument,
-              data: {
-                customerToken: {
-                  ...currentToken?.customerToken,
-                  token: 'hihaho',
-                },
-              },
-              broadcast: true,
-            })
-          }
-        }}
-      >
-        Invalidate token
-      </Button>
-    </div>
-  )
-}
diff --git a/packages/magento-customer/components/SignInForm/SignInForm.tsx b/packages/magento-customer/components/SignInForm/SignInForm.tsx
index 21e329fe69..919ae27be7 100644
--- a/packages/magento-customer/components/SignInForm/SignInForm.tsx
+++ b/packages/magento-customer/components/SignInForm/SignInForm.tsx
@@ -8,8 +8,9 @@ import { Box, FormControl, Link, SxProps, Theme } from '@mui/material'
 import { CustomerDocument } from '../../hooks'
 import { ApolloCustomerErrorAlert } from '../ApolloCustomerError/ApolloCustomerErrorAlert'
 import { SignInDocument } from './SignIn.gql'
+import { signOut } from '../SignOutForm/signOut'
 
-type SignInFormProps = { email: string; sx?: SxProps<Theme> }
+export type SignInFormProps = { email: string; sx?: SxProps<Theme> }
 
 export function SignInForm(props: SignInFormProps) {
   const { email, sx } = props
@@ -25,7 +26,7 @@ export function SignInForm(props: SignInFormProps) {
          * We are logging in because the session expired, but we're logging in with a different
          * email address, we need to reset the store.
          */
-        if (oldEmail && oldEmail !== email) await client.resetStore()
+        if (oldEmail && oldEmail !== email) signOut(client)
         return { ...values, email }
       },
     },
@@ -75,7 +76,7 @@ export function SignInForm(props: SignInFormProps) {
             variant='pill'
             size='large'
           >
-            <Trans id='Log in' />
+            <Trans id='Sign in' />
           </Button>
         </FormControl>
       </FormActions>
diff --git a/packages/magento-customer/components/SignOutForm/SignOutForm.tsx b/packages/magento-customer/components/SignOutForm/SignOutForm.tsx
index 0e5e32b414..bcdb3389b0 100644
--- a/packages/magento-customer/components/SignOutForm/SignOutForm.tsx
+++ b/packages/magento-customer/components/SignOutForm/SignOutForm.tsx
@@ -4,13 +4,14 @@ import { useRouter } from 'next/router'
 import React from 'react'
 import { ApolloCustomerErrorAlert } from '../ApolloCustomerError/ApolloCustomerErrorAlert'
 import { SignOutFormDocument } from './SignOutForm.gql'
+import { signOut } from './signOut'
 
 type SignOutFormProps = {
   button: (props: { formState: FormState<Record<string, unknown>> }) => React.ReactNode
 }
 
 export function SignOutForm(props: SignOutFormProps) {
-  const { button } = props
+  const { button: Button } = props
   const router = useRouter()
   const client = useApolloClient()
 
@@ -18,7 +19,7 @@ export function SignOutForm(props: SignOutFormProps) {
     SignOutFormDocument,
     {
       onComplete: async () => {
-        await client.clearStore()
+        signOut(client)
         await router.push('/')
       },
     },
@@ -28,7 +29,7 @@ export function SignOutForm(props: SignOutFormProps) {
 
   return (
     <form onSubmit={submitHandler} noValidate>
-      {button({ formState })}
+      <Button formState={formState} />
       <ApolloCustomerErrorAlert error={error} />
     </form>
   )
diff --git a/packages/magento-customer/components/SignOutForm/signOut.ts b/packages/magento-customer/components/SignOutForm/signOut.ts
new file mode 100644
index 0000000000..ec3d80687e
--- /dev/null
+++ b/packages/magento-customer/components/SignOutForm/signOut.ts
@@ -0,0 +1,9 @@
+import { ApolloClient } from '@graphcommerce/graphql'
+
+export function signOut(client: ApolloClient<object>) {
+  client.cache.evict({ fieldName: 'cart' })
+  client.cache.evict({ fieldName: 'customer' })
+  client.cache.evict({ fieldName: 'customerCart' })
+  client.cache.evict({ fieldName: 'currentCartId' })
+  client.cache.evict({ fieldName: 'customerToken', broadcast: true })
+}
diff --git a/packages/magento-customer/hooks/index.ts b/packages/magento-customer/hooks/index.ts
index 5de79164b9..7d73c72ad4 100644
--- a/packages/magento-customer/hooks/index.ts
+++ b/packages/magento-customer/hooks/index.ts
@@ -4,7 +4,7 @@ export * from './CustomerToken.gql'
 export * from './IsEmailAvailable.gql'
 export * from './useCustomerQuery'
 export * from './useCustomerSession'
-export * from './useFormIsEmailAvailable'
+export * from './useAccountSignInUpForm'
 export * from './useGuestQuery'
 export { default as useOrderCardItemImages } from './useOrderCardItemImages'
 export * from './UseOrderCardItemImages.gql'
diff --git a/packages/magento-customer/hooks/useAccountSignInUpForm.tsx b/packages/magento-customer/hooks/useAccountSignInUpForm.tsx
new file mode 100644
index 0000000000..41907a8577
--- /dev/null
+++ b/packages/magento-customer/hooks/useAccountSignInUpForm.tsx
@@ -0,0 +1,77 @@
+import { useQuery } from '@graphcommerce/graphql'
+import { useFormGqlQuery } from '@graphcommerce/react-hook-form'
+import { useRouter } from 'next/router'
+import { useEffect } from 'react'
+import { CustomerDocument } from './Customer.gql'
+import {
+  IsEmailAvailableDocument,
+  IsEmailAvailableQuery,
+  IsEmailAvailableQueryVariables,
+} from './IsEmailAvailable.gql'
+import { useCustomerSession } from './useCustomerSession'
+
+export type UseFormIsEmailAvailableProps = {
+  onSubmitted?: (data: { email: string }) => void
+}
+
+export type AccountSignInUpState = 'email' | 'signin' | 'signup' | 'signedin' | 'session-expired'
+
+export const isToggleMethod = !import.meta.graphCommerce.enableGuestCheckoutLogin
+
+export function useAccountSignInUpForm(props: UseFormIsEmailAvailableProps = {}) {
+  const { onSubmitted } = props
+  const { token, valid } = useCustomerSession()
+
+  const customerQuery = useQuery(CustomerDocument, { fetchPolicy: 'cache-only' })
+  const cachedEmail = customerQuery?.data?.customer?.email
+
+  const form = useFormGqlQuery<
+    IsEmailAvailableQuery,
+    IsEmailAvailableQueryVariables & { requestedMode?: 'signin' | 'signup' }
+  >(
+    IsEmailAvailableDocument,
+    {
+      experimental_useV2: true,
+      mode: 'onBlur',
+      values: { email: cachedEmail ?? '' },
+      defaultValues: { requestedMode: 'signin' },
+    },
+    { fetchPolicy: 'cache-and-network' },
+  )
+  const { formState, data, handleSubmit } = form
+  const { isSubmitSuccessful, isValid } = formState
+
+  const router = useRouter()
+  useEffect(() => {
+    const emailFromParams = router.query.email as string
+
+    if (!cachedEmail && emailFromParams) {
+      form.setValue('email', emailFromParams)
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      form.trigger('email')
+    }
+  }, [cachedEmail, router.query.email, form])
+
+  const submit = isToggleMethod
+    ? async (e?: React.BaseSyntheticEvent) => {
+        e?.preventDefault()
+        await form.trigger('email')
+      }
+    : handleSubmit(onSubmitted || (() => {}))
+
+  const hasAccount = data?.isEmailAvailable?.is_email_available === false
+
+  let mode: AccountSignInUpState
+  if (token && valid) mode = 'signedin'
+  else if (token && !valid) mode = 'session-expired'
+  else if (isToggleMethod) {
+    mode = form.watch('requestedMode') ?? 'signin'
+  } else {
+    // 1. Nothing is entered
+    mode = 'email'
+
+    if (isValid && isSubmitSuccessful) mode = hasAccount ? 'signin' : 'signup'
+  }
+
+  return { mode, form, submit }
+}
diff --git a/packages/magento-customer/hooks/useCustomerSession.ts b/packages/magento-customer/hooks/useCustomerSession.ts
index 30a4647176..5744e0ea0a 100644
--- a/packages/magento-customer/hooks/useCustomerSession.ts
+++ b/packages/magento-customer/hooks/useCustomerSession.ts
@@ -7,22 +7,19 @@ import {
 
 export type UseCustomerSessionOptions = Record<string, unknown>
 
-export type UseCustomerSessionReturn =
-  | {
-      loggedIn: boolean
-      requireAuth: boolean
-      query: QueryResult<CustomerTokenQuery, CustomerTokenQueryVariables>
-    } & Partial<Omit<NonNullable<CustomerTokenQuery['customerToken']>, '__typename'>>
+export type UseCustomerSessionReturn = {
+  loggedIn: boolean
+  query: QueryResult<CustomerTokenQuery, CustomerTokenQueryVariables>
+} & Partial<Omit<NonNullable<CustomerTokenQuery['customerToken']>, '__typename'>>
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 export function useCustomerSession(_: UseCustomerSessionOptions = {}) {
   const query = useQuery(CustomerTokenDocument)
-  const token = query.data?.customerToken
+  const tokenData = query.data?.customerToken
 
   return {
-    ...token,
-    loggedIn: Boolean(token?.token && token.valid),
-    requireAuth: Boolean(!token || !token.valid),
+    ...tokenData,
+    loggedIn: Boolean(tokenData?.token),
     query,
   }
 }
diff --git a/packages/magento-customer/hooks/useCustomerValidateToken.ts b/packages/magento-customer/hooks/useCustomerValidateToken.ts
deleted file mode 100644
index dd4561bade..0000000000
--- a/packages/magento-customer/hooks/useCustomerValidateToken.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { useApolloClient } from '@graphcommerce/graphql'
-import { ErrorCategory } from '@graphcommerce/magento-graphql'
-import { useRouter } from 'next/router'
-import { UseCustomerValidateTokenDocument } from './UseCustomerValidateToken.gql'
-import { useCustomerQuery } from './useCustomerQuery'
-
-/** Validates the current customer token. This hook is supposed to be called only once. */
-export function useCustomerValidateToken() {
-  const client = useApolloClient()
-  const router = useRouter()
-
-  useCustomerQuery(UseCustomerValidateTokenDocument, {
-    initialFetchPolicy: 'network-only',
-    onError: async ({ graphQLErrors }) => {
-      const category: ErrorCategory = 'graphql-authorization'
-      // If there is no authorization error, do nothing.
-      if (!graphQLErrors.some((e) => e.extensions?.category === category)) return
-
-      await client.clearStore()
-      router.reload()
-    },
-  })
-}
diff --git a/packages/magento-customer/hooks/useFormIsEmailAvailable.tsx b/packages/magento-customer/hooks/useFormIsEmailAvailable.tsx
deleted file mode 100644
index e633f57d8b..0000000000
--- a/packages/magento-customer/hooks/useFormIsEmailAvailable.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import { useFormAutoSubmit, useFormGqlQuery } from '@graphcommerce/react-hook-form'
-import { useEffect, useState } from 'react'
-import { CustomerDocument } from './Customer.gql'
-import {
-  IsEmailAvailableDocument,
-  IsEmailAvailableQuery,
-  IsEmailAvailableQueryVariables,
-} from './IsEmailAvailable.gql'
-import { useCustomerQuery } from './useCustomerQuery'
-import { useCustomerSession } from './useCustomerSession'
-
-export type UseFormIsEmailAvailableProps = {
-  email?: string | null
-  onSubmitted?: (data: { email: string }) => void
-}
-
-export type AccountSignInUpState = 'email' | 'signin' | 'signup' | 'signedin' | 'session-expired'
-
-export const isToggleMethod = !import.meta.graphCommerce.enableGuestCheckoutLogin
-
-export function useFormIsEmailAvailable(props: UseFormIsEmailAvailableProps) {
-  const { email, onSubmitted } = props
-  const { loggedIn, requireAuth } = useCustomerSession()
-  const customerQuery = useCustomerQuery(CustomerDocument)
-
-  const form = useFormGqlQuery<
-    IsEmailAvailableQuery,
-    IsEmailAvailableQueryVariables & { requestedMode?: 'signin' | 'signup' }
-  >(
-    IsEmailAvailableDocument,
-    { mode: 'onChange', defaultValues: { email: email ?? '', requestedMode: 'signin' } },
-    { fetchPolicy: 'cache-and-network' },
-  )
-  const { formState, data, handleSubmit } = form
-
-  const submit = isToggleMethod ? () => Promise.resolve() : handleSubmit(onSubmitted || (() => {}))
-  const autoSubmitting = useFormAutoSubmit({
-    form,
-    submit,
-    forceInitialSubmit: true,
-    disabled: isToggleMethod,
-  })
-
-  const hasAccount = data?.isEmailAvailable?.is_email_available === false
-  const modeFromIsEmailAvailable = hasAccount ? 'signin' : 'signup'
-  const modeFromToggle = form.watch('requestedMode') ?? 'signin'
-  const requestedMode = isToggleMethod ? modeFromToggle : modeFromIsEmailAvailable
-
-  const { isDirty, isSubmitSuccessful, isSubmitted, isSubmitting, isValid } = formState
-
-  const [mode, setMode] = useState<AccountSignInUpState>(loggedIn ? 'signedin' : 'email')
-
-  useEffect(() => {
-    if (loggedIn) {
-      setMode('signedin')
-      return
-    }
-    if (isToggleMethod) setMode(requestedMode)
-    if (isSubmitting) return
-    if (!isValid) return
-    if (!isDirty && isSubmitted && isSubmitSuccessful && isValid) setMode(requestedMode)
-
-    if (customerQuery.data?.customer && requireAuth)
-      setMode(isSubmitSuccessful ? 'signin' : 'session-expired')
-  }, [
-    customerQuery.data?.customer,
-    requestedMode,
-    isDirty,
-    isSubmitSuccessful,
-    isSubmitted,
-    isSubmitting,
-    isValid,
-    loggedIn,
-    requireAuth,
-  ])
-
-  return { mode, form, submit, autoSubmitting, hasAccount }
-}
diff --git a/packages/magento-customer/index.ts b/packages/magento-customer/index.ts
index ec50b9fe82..8642a0168f 100644
--- a/packages/magento-customer/index.ts
+++ b/packages/magento-customer/index.ts
@@ -1,7 +1,6 @@
 export * from './components'
 export * from './hooks'
 export * from './typePolicies'
-export * from './link/createCustomerTokenLink'
 export * from './graphql/AccountDashboardOrders.gql'
 export * from './graphql/AccountDashboardAddresses.gql'
 export * from './graphql/AccountDashboard.gql'
diff --git a/packages/magento-customer/link/createCustomerTokenLink.ts b/packages/magento-customer/link/createCustomerTokenLink.ts
deleted file mode 100644
index 69eeb2fb03..0000000000
--- a/packages/magento-customer/link/createCustomerTokenLink.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { setContext } from '@graphcommerce/graphql/apollo'
-import { CustomerTokenDocument } from '../hooks'
-
-export const addTokenHeader = setContext((_, context) => {
-  if (!context.headers) context.headers = {}
-  try {
-    const query = context.cache.readQuery({ query: CustomerTokenDocument })
-    if (query?.customerToken?.token) {
-      context.headers.authorization = `Bearer ${query?.customerToken?.token}`
-      return context
-    }
-    return context
-  } catch (error) {
-    return context
-  }
-})
-
-export const customerTokenLink = addTokenHeader
diff --git a/packages/magento-customer/link/customerLink.ts b/packages/magento-customer/link/customerLink.ts
new file mode 100644
index 0000000000..a3aaa55ef8
--- /dev/null
+++ b/packages/magento-customer/link/customerLink.ts
@@ -0,0 +1,115 @@
+import { globalApolloClient } from '@graphcommerce/graphql'
+import { ApolloLink, fromPromise, onError, setContext } from '@graphcommerce/graphql/apollo'
+import { ErrorCategory } from '@graphcommerce/magento-graphql'
+import { GraphQLError } from 'graphql'
+import { NextRouter } from 'next/router'
+import { signOut } from '../components/SignOutForm/signOut'
+import { CustomerTokenDocument } from '../hooks'
+
+export type PushRouter = Pick<NextRouter, 'push' | 'events'>
+
+async function pushWithPromise(router: Pick<NextRouter, 'push' | 'events'>, url: string) {
+  try {
+    await router.push(url)
+  } catch {
+    // Router push failed, resolving promise.
+    return false
+  }
+
+  return new Promise<boolean>((resolve) => {
+    function navigatedAwayFromTarget(incoming: string) {
+      if (incoming.includes(url)) return
+      // Navigated away from target, resolving promise.
+      router.events.off('routeChangeComplete', navigatedAwayFromTarget)
+      resolve(true)
+    }
+    function navigatedToTarget(incoming: string) {
+      if (incoming.includes(url)) {
+        // We are at the destination
+        router.events.off('routeChangeComplete', navigatedToTarget)
+        router.events.on('routeChangeComplete', navigatedAwayFromTarget)
+      } else {
+        // Navigated to target, but not the destination, resolving promise.
+        resolve(false)
+      }
+    }
+    router.events.on('routeChangeComplete', navigatedToTarget)
+  })
+}
+
+function isErrorCategory(err: GraphQLError, category: ErrorCategory) {
+  return err.extensions?.category === category
+}
+
+const addTokenHeader = setContext((_, context) => {
+  if (!context.headers) context.headers = {}
+
+  try {
+    const query = context.cache.readQuery({ query: CustomerTokenDocument })
+
+    if (query?.customerToken?.token) {
+      context.headers.authorization = `Bearer ${query?.customerToken?.token}`
+      return context
+    }
+    return context
+  } catch (error) {
+    return context
+  }
+})
+
+const customerErrorLink = (router: PushRouter) =>
+  onError((context) => {
+    const { graphQLErrors, operation, forward } = context
+    const client = globalApolloClient.current
+    if (!client) return undefined
+
+    const oldHeaders = operation.getContext().headers
+    const authError = graphQLErrors?.find((err) => isErrorCategory(err, 'graphql-authorization'))
+
+    /** If the error we're dealing with is not an authorization error, we're done. */
+    if (!authError) return undefined
+
+    if (!oldHeaders.authorization) {
+      // console.error(
+      //   'No authorization header found in request, but an authorization error was returned, this is a bug. This is the operation:',
+      //   operation,
+      // )
+      return undefined
+    }
+
+    const currentToken = client.cache.readQuery({ query: CustomerTokenDocument })?.customerToken
+    if (!currentToken) throw Error('We currenly do not have a customer token in the cache.')
+    client.writeQuery({
+      query: CustomerTokenDocument,
+      data: { customerToken: { ...currentToken, valid: false } },
+    })
+
+    // After submission of the signIn form, navigate back to the current route.
+    // Resolve the promomise.
+    // Dependending on the result, either retry the request or clean up the cache.
+
+    const signInAgainPromise = pushWithPromise(router, '/account/signin')
+
+    return fromPromise(signInAgainPromise).flatMap(() => {
+      const tokenQuery = client.cache.readQuery({ query: CustomerTokenDocument })
+
+      if (tokenQuery?.customerToken?.valid) {
+        // Customer is reauthenticated, retrying request.
+        operation.setContext({
+          headers: {
+            ...oldHeaders,
+            authorization: `Bearer ${tokenQuery?.customerToken?.token}`,
+          },
+        })
+      } else {
+        // Customer has not reauthenticated, clearing all customer data.
+        signOut(client)
+      }
+
+      // retry the request, returning the new observable
+      return forward(operation)
+    })
+  })
+
+export const customerLink = (router: PushRouter) =>
+  ApolloLink.from([addTokenHeader, customerErrorLink(router)])
diff --git a/packages/magento-customer/plugins/MagentoCustomerGraphqlProvider.tsx b/packages/magento-customer/plugins/MagentoCustomerGraphqlProvider.tsx
index 34b7a8235e..0d3f9a3a07 100644
--- a/packages/magento-customer/plugins/MagentoCustomerGraphqlProvider.tsx
+++ b/packages/magento-customer/plugins/MagentoCustomerGraphqlProvider.tsx
@@ -1,17 +1,28 @@
 import { GraphQLProviderProps } from '@graphcommerce/graphql'
 import type { PluginProps } from '@graphcommerce/next-config'
-import { customerTokenLink } from '../link/createCustomerTokenLink'
+import { useEventCallback } from '@mui/material'
+import { NextRouter } from 'next/router'
+import { useMemo } from 'react'
+import { customerLink } from '../link/customerLink'
 import { customerTypePolicies, migrateCustomer } from '../typePolicies'
 
 export const component = 'GraphQLProvider'
 export const exported = '@graphcommerce/graphql'
 
 function MagentoCustomerGraphqlProvider(props: PluginProps<GraphQLProviderProps>) {
-  const { Prev, links = [], policies = [], migrations = [], ...rest } = props
+  const { Prev, links = [], policies = [], migrations = [], router, ...rest } = props
+
+  const push = useEventCallback<NextRouter['push']>((...args) => router.push(...args))
+  const customerLinkMemo = useMemo(
+    () => customerLink({ push, events: router.events }),
+    [push, router.events],
+  )
+
   return (
     <Prev
       {...rest}
-      links={[...links, customerTokenLink]}
+      router={router}
+      links={[...links, customerLinkMemo]}
       policies={[...policies, customerTypePolicies]}
       migrations={[...migrations, migrateCustomer]}
     />
diff --git a/packages/magento-customer/plugins/SessionDebuggerPlugin.tsx b/packages/magento-customer/plugins/SessionDebuggerPlugin.tsx
new file mode 100644
index 0000000000..e1ea3cbc33
--- /dev/null
+++ b/packages/magento-customer/plugins/SessionDebuggerPlugin.tsx
@@ -0,0 +1,50 @@
+import type { FramerNextPages } from '@graphcommerce/framer-next-pages'
+import { useApolloClient } from '@graphcommerce/graphql/apollo'
+import type { IfConfig, ReactPlugin } from '@graphcommerce/next-config'
+import { Button } from '@mui/material'
+import { CustomerTokenDocument } from '../hooks/CustomerToken.gql'
+
+export const component = 'FramerNextPages'
+export const exported = '@graphcommerce/framer-next-pages'
+export const ifConfig: IfConfig = 'debug.sessions'
+
+const SessionDebuggerPlugin: ReactPlugin<typeof FramerNextPages> = (props) => {
+  const { Prev, ...rest } = props
+  const client = useApolloClient()
+
+  return (
+    <>
+      <Prev {...rest} />
+      <div style={{ position: 'fixed', bottom: 0, right: 0, zIndex: 1, opacity: 0.3 }}>
+        <Button
+          type='button'
+          variant='text'
+          size='small'
+          onClick={() => {
+            const currentToken = client.readQuery({ query: CustomerTokenDocument })
+            if (!currentToken?.customerToken?.token) {
+              console.log('No customerToken available, nothing to break')
+            } else {
+              console.log(`Changing current token to a random one`)
+
+              client.writeQuery({
+                query: CustomerTokenDocument,
+                data: {
+                  customerToken: {
+                    ...currentToken?.customerToken,
+                    token: 'hihaho',
+                  },
+                },
+                broadcast: true,
+              })
+            }
+          }}
+        >
+          Invalidate session token
+        </Button>
+      </div>
+    </>
+  )
+}
+
+export const Plugin = SessionDebuggerPlugin
diff --git a/packages/magento-customer/typePolicies.ts b/packages/magento-customer/typePolicies.ts
index 676b9b3ef8..3c0fff0ff1 100644
--- a/packages/magento-customer/typePolicies.ts
+++ b/packages/magento-customer/typePolicies.ts
@@ -45,29 +45,8 @@ const generateCustomerToken: FieldPolicy<Mutation['generateCustomerToken']> = {
   },
 }
 
-const createCustomer: FieldPolicy<Mutation['createCustomer']> = {
-  merge(_existing, incoming, options) {
-    if (incoming?.customer.email) {
-      options.cache.writeQuery({
-        query: IsEmailAvailableDocument,
-        variables: { email: incoming?.customer.email },
-        data: { isEmailAvailable: { is_email_available: false } },
-        broadcast: true,
-      })
-    }
-
-    return incoming
-  },
-}
-
-// const customer: FieldReadFunction<Query['customer']> = (incoming, options) => {
-//   if (!options.canRead(incoming)) return null
-//   return incoming
-// }
-
 export const customerTypePolicies: StrictTypedTypePolicies = {
-  // Query: { fields: { customer } },
-  Mutation: { fields: { generateCustomerToken, createCustomer, createCustomerV2: createCustomer } },
+  Mutation: { fields: { generateCustomerToken } },
   CustomerToken: { fields: { valid } },
 }
 
diff --git a/packagesDev/next-config/dist/generated/config.js b/packagesDev/next-config/dist/generated/config.js
index 05666c3ba8..a9b6619f10 100644
--- a/packagesDev/next-config/dist/generated/config.js
+++ b/packagesDev/next-config/dist/generated/config.js
@@ -97,6 +97,7 @@ function GraphCommerceConfigSchema() {
 function GraphCommerceDebugConfigSchema() {
     return _zod.z.object({
         pluginStatus: _zod.z.boolean().nullish(),
+        sessions: _zod.z.boolean().nullish(),
         webpackCircularDependencyPlugin: _zod.z.boolean().nullish(),
         webpackDuplicatesPlugin: _zod.z.boolean().nullish()
     });
diff --git a/packagesDev/next-config/src/generated/config.ts b/packagesDev/next-config/src/generated/config.ts
index bdc644ee0e..7f37fe0be4 100644
--- a/packagesDev/next-config/src/generated/config.ts
+++ b/packagesDev/next-config/src/generated/config.ts
@@ -308,6 +308,8 @@ export type GraphCommerceConfig = {
 export type GraphCommerceDebugConfig = {
   /** Reports which plugins are enabled or disabled. */
   pluginStatus?: InputMaybe<Scalars['Boolean']['input']>;
+  /** Enable debugging interface to debug sessions */
+  sessions?: InputMaybe<Scalars['Boolean']['input']>;
   /**
    * Cyclic dependencies can cause memory issues and other strange bugs.
    * This plugin will warn you when it detects a cyclic dependency.
@@ -472,6 +474,7 @@ export function GraphCommerceConfigSchema(): z.ZodObject<Properties<GraphCommerc
 export function GraphCommerceDebugConfigSchema(): z.ZodObject<Properties<GraphCommerceDebugConfig>> {
   return z.object({
     pluginStatus: z.boolean().nullish(),
+    sessions: z.boolean().nullish(),
     webpackCircularDependencyPlugin: z.boolean().nullish(),
     webpackDuplicatesPlugin: z.boolean().nullish()
   })