diff --git a/framework/commercelayer/api/endpoints/checkout/checkout.ts b/framework/commercelayer/api/endpoints/checkout/checkout.ts
index 809083144..a5550f8d0 100644
--- a/framework/commercelayer/api/endpoints/checkout/checkout.ts
+++ b/framework/commercelayer/api/endpoints/checkout/checkout.ts
@@ -7,16 +7,20 @@ const checkout: CheckoutEndpoint['handlers']['checkout'] = async ({
   res,
 }) => {
   let { orderId, accessToken } = req.query
-  accessToken =
-    typeof accessToken === 'string' ? accessToken.split('; CL_TOKEN=') : ''
-  accessToken = accessToken[accessToken.length - 1]
+
+    const name = 'CL_TOKEN' + "=";
+    const cookiesArr = decodeURIComponent(accessToken = typeof accessToken === 'string' ? accessToken : '').split('; ');
+    accessToken = typeof accessToken
+    cookiesArr.forEach(val => {
+      if (val.indexOf(name) === 0) accessToken = val.substring(name.length)
+    })
+
   const { endpoint } = getCredentials()
   if (orderId && accessToken) {
     const clOrder = await Order.withCredentials({ endpoint, accessToken })
       .includes('lineItems')
       .find(orderId as string, { rawResponse: true })
     const checkoutUrl = clOrder.data.attributes.checkout_url
-    console.log(checkoutUrl)
 
     if (checkoutUrl) {
       res.redirect(checkoutUrl)
diff --git a/framework/commercelayer/api/operations/get-all-products.ts b/framework/commercelayer/api/operations/get-all-products.ts
index 46d231dc3..c76fe0ff4 100644
--- a/framework/commercelayer/api/operations/get-all-products.ts
+++ b/framework/commercelayer/api/operations/get-all-products.ts
@@ -53,4 +53,4 @@ export default function getAllProductsOperation({
     }
   }
   return getAllProducts
-}
+}
\ No newline at end of file
diff --git a/framework/commercelayer/api/operations/get-page.ts b/framework/commercelayer/api/operations/get-page.ts
index 839ddd360..c35abdb2a 100644
--- a/framework/commercelayer/api/operations/get-page.ts
+++ b/framework/commercelayer/api/operations/get-page.ts
@@ -9,7 +9,7 @@ export default function getPageOperation() {
   function getPage(): Promise<GetPageResult> {
     return Promise.resolve({
       page: {
-        body: `<script>location.href = '/api/checkout/?orderId=' + localStorage.getItem('CL_ORDER') + '&accessToken=' + document.cookie</script>`,
+        body: `<script>location.href = '/api/checkout/?orderId=' + localStorage.getItem('CL_ORDER_ID') + '&accessToken=' + document.cookie</script>`,
       },
     })
   }
diff --git a/framework/commercelayer/api/utils/fetch-local.ts b/framework/commercelayer/api/utils/fetch-local.ts
index de6904ee5..831eb9597 100644
--- a/framework/commercelayer/api/utils/fetch-local.ts
+++ b/framework/commercelayer/api/utils/fetch-local.ts
@@ -1,9 +1,9 @@
 import { FetcherError } from '@commerce/utils/errors'
 import type { GraphQLFetcher } from '@commerce/api'
-import type { LocalConfig } from '../index'
+import type { CommercelayerConfig } from '../index'
 import fetch from './fetch'
 
-const fetchGraphqlApi: (getConfig: () => LocalConfig) => GraphQLFetcher =
+const fetchGraphqlApi: (getConfig: () => CommercelayerConfig) => GraphQLFetcher =
   (getConfig) =>
   async (query: string, { variables, preview } = {}, fetchOptions) => {
     debugger
diff --git a/framework/commercelayer/auth/use-login.tsx b/framework/commercelayer/auth/use-login.tsx
index aba77f834..bcea24225 100644
--- a/framework/commercelayer/auth/use-login.tsx
+++ b/framework/commercelayer/auth/use-login.tsx
@@ -1,15 +1,18 @@
+import { useCallback } from 'react'
+import useCustomer from '../customer/use-customer'
 import { MutationHook } from '@commerce/utils/types'
 import useLogin, { UseLogin } from '@commerce/auth/use-login'
 import { CommerceError } from '@commerce/utils/errors'
 import { getCustomerToken } from '@commercelayer/js-auth'
-import { ENDPOINT, CLIENTID, SCOPE } from '../const'
 import setCookie from '@framework/api/utils/cookies'
+import Cookies from 'js-cookie'
+import { ENDPOINT, CLIENTID, SCOPE } from '../const'
 
 export default useLogin as UseLogin<typeof handler>
 
 export const handler: MutationHook<any> = {
   fetchOptions: {
-    url: `${ENDPOINT}/api/customers`,
+    url: '',
   },
   async fetcher({ input: { email, password }, options, fetch }) {
     if (!(email && password)) {
@@ -24,10 +27,11 @@ export const handler: MutationHook<any> = {
           clientId: CLIENTID,
           scope: SCOPE,
         },
-        { username: email, password }
+        { username: email, password: password }
       )
       token &&
-        setCookie('CL_TOKEN', token.accessToken, { expires: token.expires })
+        setCookie('CL_CUSTOMER_TOKEN', token.accessToken, { expires: token.expires })
+      Cookies.set('CL_CUSTOMER_ID', token.data.owner_id as string)
       alert(`User "${email}" has successfully been logged in.`)
       return token
     } catch (error) {
@@ -37,11 +41,17 @@ export const handler: MutationHook<any> = {
     }
   },
   useHook:
-    ({ fetch }) =>
-    () => {
-      return async function login(input) {
+  ({ fetch }) =>
+  () => {
+    const { revalidate } = useCustomer()
+
+    return useCallback(
+      async function login(input) {
         const data = await fetch({ input })
+        await revalidate()
         return data
-      }
-    },
+      },
+      [fetch, revalidate]
+    )
+  },
 }
diff --git a/framework/commercelayer/auth/use-signup.tsx b/framework/commercelayer/auth/use-signup.tsx
index 608f6f7bc..66a9eae20 100644
--- a/framework/commercelayer/auth/use-signup.tsx
+++ b/framework/commercelayer/auth/use-signup.tsx
@@ -3,7 +3,10 @@ import useCustomer from '../customer/use-customer'
 import { MutationHook } from '@commerce/utils/types'
 import useSignup, { UseSignup } from '@commerce/auth/use-signup'
 import { CommerceError } from '@commerce/utils/errors'
-import {ENDPOINT} from '../const'
+import { getCustomerToken } from '@commercelayer/js-auth'
+import setCookie from '@framework/api/utils/cookies'
+import Cookies from 'js-cookie'
+import { ENDPOINT, CLIENTID, SCOPE } from '../const'
 
 export default useSignup as UseSignup<typeof handler>
 
@@ -11,7 +14,7 @@ export const handler: MutationHook<any> = {
   fetchOptions: {
     query: 'customers',
     url: `${ENDPOINT}/api/customers`,
-    method: 'POST'
+    method: 'POST',
   },
   async fetcher({ input: { email, password }, options, fetch }) {
     if (!(email && password)) {
@@ -28,6 +31,17 @@ export const handler: MutationHook<any> = {
           password,
         },
       })
+      const token = await getCustomerToken(
+        {
+          endpoint: ENDPOINT,
+          clientId: CLIENTID,
+          scope: SCOPE,
+        },
+        { username: email, password: password }
+      )
+      token &&
+        setCookie('CL_CUSTOMER_TOKEN', token.accessToken, { expires: token.expires })
+      Cookies.set('CL_CUSTOMER_ID', data.id)
       alert(`User "${email}" has successfully been created.`)
       return data
     } catch (error) {
@@ -39,9 +53,15 @@ export const handler: MutationHook<any> = {
   useHook:
     ({ fetch }) =>
     () => {
-      return async function signup(input) {
-        const data = await fetch({ input })
-        return data
-      }
+      const { revalidate } = useCustomer()
+
+      return useCallback(
+        async function signup(input) {
+          const data = await fetch({ input })
+          await revalidate()
+          return data
+        },
+        [fetch, revalidate]
+      )
     },
 }
diff --git a/framework/commercelayer/cart/use-add-item.tsx b/framework/commercelayer/cart/use-add-item.tsx
index 80ea5bb9a..6b1790e93 100644
--- a/framework/commercelayer/cart/use-add-item.tsx
+++ b/framework/commercelayer/cart/use-add-item.tsx
@@ -11,14 +11,14 @@ export const handler: MutationHook<any> = {
     query: '',
   },
   async fetcher({ input, options, fetch }) {
-    const localOrderId = localStorage.getItem('CL_ORDER')
+    const localOrderId = localStorage.getItem('CL_ORDER_ID')
     const credentials = getCredentials()
     const orderId =
       localOrderId ||
       (credentials.accessToken &&
         (await Order.withCredentials(credentials).create({})).id)
     if (orderId && input.sizeId) {
-      !localOrderId && localStorage.setItem('CL_ORDER', orderId)
+      !localOrderId && localStorage.setItem('CL_ORDER_ID', orderId)
       const lineItem = await LineItem.withCredentials(credentials).create(
         {
           skuCode: input.sizeId,
diff --git a/framework/commercelayer/cart/use-cart.tsx b/framework/commercelayer/cart/use-cart.tsx
index a1e7dc3ee..592a01d93 100644
--- a/framework/commercelayer/cart/use-cart.tsx
+++ b/framework/commercelayer/cart/use-cart.tsx
@@ -12,7 +12,7 @@ export const handler: SWRHook<any> = {
     query: '',
   },
   async fetcher() {
-    const id = localStorage.getItem('CL_ORDER') || ''
+    const id = localStorage.getItem('CL_ORDER_ID') || ''
     const credentials = getCredentials()
     if (id && credentials.accessToken) {
       const clOrder = await Order.withCredentials(credentials)
diff --git a/framework/commercelayer/cart/use-remove-item.tsx b/framework/commercelayer/cart/use-remove-item.tsx
index 6c66ef300..de72b63f5 100644
--- a/framework/commercelayer/cart/use-remove-item.tsx
+++ b/framework/commercelayer/cart/use-remove-item.tsx
@@ -12,7 +12,7 @@ export const handler: MutationHook<any> = {
   },
   async fetcher({ input: { id } }) {
     const credentials = getCredentials()
-    const orderId = localStorage.getItem('CL_ORDER')
+    const orderId = localStorage.getItem('CL_ORDER_ID')
     if (orderId && id) {
       await LineItem.build({ id }).withCredentials(credentials).destroy()
       return {}
diff --git a/framework/commercelayer/cart/use-update-item.tsx b/framework/commercelayer/cart/use-update-item.tsx
index e768b2e99..36d7fd08f 100644
--- a/framework/commercelayer/cart/use-update-item.tsx
+++ b/framework/commercelayer/cart/use-update-item.tsx
@@ -12,7 +12,7 @@ export const handler: MutationHook<any> = {
   },
   async fetcher({ input: { item, quantity } }) {
     const credentials = getCredentials()
-    const orderId = localStorage.getItem('CL_ORDER')
+    const orderId = localStorage.getItem('CL_ORDER_ID')
     if (orderId && item.id) {
       const lineItem = (await LineItem.build({
         id: item.id,
diff --git a/framework/commercelayer/customer/use-customer.tsx b/framework/commercelayer/customer/use-customer.tsx
index 41757cd0d..c8dfe51c0 100644
--- a/framework/commercelayer/customer/use-customer.tsx
+++ b/framework/commercelayer/customer/use-customer.tsx
@@ -1,15 +1,37 @@
 import { SWRHook } from '@commerce/utils/types'
+import { CustomerHook } from '@commerce/types/customer'
 import useCustomer, { UseCustomer } from '@commerce/customer/use-customer'
+import Cookies from 'js-cookie'
+import { ENDPOINT } from '../const'
 
 export default useCustomer as UseCustomer<typeof handler>
-export const handler: SWRHook<any> = {
+
+const customerId = Cookies.get('CL_CUSTOMER_ID')
+
+export const handler: SWRHook<CustomerHook> = {
   fetchOptions: {
-    query: '',
+    url: `${ENDPOINT}/api/customers/${customerId}`,
+    method: 'GET',
   },
-  async fetcher({ input, options, fetch }) {},
-  useHook: () => () => {
-    return async function addItem() {
-      return {}
-    }
+  async fetcher({ input, options, fetch }) {
+    const data = await fetch({...options})
+    
+    return data ? ({
+      firstName: '',
+      lastName: '',
+      email: data.attributes.email ?? '',
+    } as any)
+  : null
   },
+
+  useHook:
+    ({ useData }) =>
+    (input) => {
+      return useData({
+        swrOptions: {
+          revalidateOnFocus: false,
+          ...input?.swrOptions,
+        },
+      })
+    },
 }
diff --git a/framework/commercelayer/fetcher.ts b/framework/commercelayer/fetcher.ts
index 27684a4ce..48755246d 100644
--- a/framework/commercelayer/fetcher.ts
+++ b/framework/commercelayer/fetcher.ts
@@ -1,7 +1,8 @@
 import { Fetcher } from '@commerce/utils/types'
 import handleFetchResponse from './utils/handle-fetch-response'
-import { ENDPOINT, CLIENTID, SCOPE } from './const'
 import { getSalesChannelToken } from '@commercelayer/js-auth'
+import Cookies from 'js-cookie'
+import { ENDPOINT, CLIENTID, SCOPE } from './const'
 
 export const fetcher: Fetcher = async ({ url, method, variables, query }) => {
   const token = await getSalesChannelToken({
@@ -9,21 +10,37 @@ export const fetcher: Fetcher = async ({ url, method, variables, query }) => {
     clientId: CLIENTID,
     scope: SCOPE,
   })
+  const customerToken = Cookies.get('CL_CUSTOMER_TOKEN')
 
-  return handleFetchResponse(
-    await fetch(url!, {
-      method,
-      headers: {
-        Accept: 'application/vnd.api+json',
-        Authorization: `Bearer ${token.accessToken}`, 
-        'Content-Type': 'application/vnd.api+json',
-      },
-      body: JSON.stringify({
-        data: {
-          type: query,
-          attributes: variables,
+  if (method == 'POST') {
+    return handleFetchResponse(
+      await fetch(url!, {
+        method,
+        headers: {
+          Accept: 'application/vnd.api+json',
+          Authorization: `Bearer ${token.accessToken}`, 
+          'Content-Type': 'application/vnd.api+json',
         },
-      }),
-    })
-  )
+        body: JSON.stringify({
+          data: {
+            type: query,
+            attributes: variables,
+          },
+        }),
+      })
+    )
+  }
+
+  if (method == 'GET') {
+    return handleFetchResponse(
+      await fetch(url!, {
+        method,
+        headers: {
+          Accept: 'application/vnd.api+json',
+          Authorization: `Bearer ${customerToken}`, 
+          'Content-Type': 'application/vnd.api+json',
+        }
+      })
+    )
+  }
 }