diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e3939bd03..867026bb7b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable, unreleased changes to this project will be documented in this file.
 - Add Cypress tags to all of the buttons (also speed up tests) - #718 by @krzysztofwolski
 - Automatically choose variant attributes from url in ProductVariantPicker - #708 by @AlicjaSzu
 - Use sdk as a standalone package - #724 by @dominik-zeglen
+- Use auth api from sdk - #727 by @orzechdev
 - Fix CartRow tests - #749 by @dominik-zeglen
 - Add prettier to precommit - #766 by @dominik-zeglen
 - Do not use prettier on generated files - #773 by @dominik-zeglen
diff --git a/cypress/elements/saleor-account/login-selectors.js b/cypress/elements/saleor-account/login-selectors.js
index d32eb27528..87752ba0c6 100644
--- a/cypress/elements/saleor-account/login-selectors.js
+++ b/cypress/elements/saleor-account/login-selectors.js
@@ -3,5 +3,5 @@ export const LOGIN_SELECTORS = {
   emailAddressInput: "[data-test=loginOverlay] input[name='email']",
   emailPasswordInput: "[data-test=loginOverlay] input[name='password']",
   signInButton: "[data-test=submit]",
-  warningCredentialMessage: ".form-error",
+  warningCredentialMessage: ".input__error",
 };
diff --git a/cypress/support/login/index.js b/cypress/support/login/index.js
index b3a3795f69..75db810ae3 100644
--- a/cypress/support/login/index.js
+++ b/cypress/support/login/index.js
@@ -1,11 +1,11 @@
 import { userBuilder } from "../generate";
-const mainMenuButton = "[data-test=desktopMenuLoginOverlayLink]"
-const allertPopupMessage = "[data-test=alert]"
-const emailAddressInput = "[data-test=loginOverlay] input[name='email']"
-const emailPasswordInput = "[data-test=loginOverlay] input[name='password']"
-const signInButton = "[data-test=submit]"
-const loggedInMainMenuButton = "[data-test=userButton]"
-const logOutButton = "[data-test=desktopMenuLogoutLink]"
+const mainMenuButton = "[data-test=desktopMenuLoginOverlayLink]";
+const allertPopupMessage = "[data-test=alert]";
+const emailAddressInput = "[data-test=loginOverlay] input[name='email']";
+const emailPasswordInput = "[data-test=loginOverlay] input[name='password']";
+const signInButton = "[data-test=submit]";
+const loggedInMainMenuButton = "[data-test=userButton]";
+const logOutButton = "[data-test=desktopMenuLogoutLink]";
 
 const createUser = () => {
   const user = userBuilder();
@@ -29,8 +29,8 @@ Cypress.Commands.add("loginUser", (email, password) => {
     .type(password)
     .get(signInButton)
     .click()
-    .get(allertPopupMessage)
-    .should("contain", "You are now logged in", {timeoout: 20000});
+    .get(allertPopupMessage, { timeout: 3000 })
+    .should("contain", "You are now logged in", { timeoout: 20000 });
 });
 
 Cypress.Commands.add("logoutUser", () =>
@@ -39,6 +39,6 @@ Cypress.Commands.add("logoutUser", () =>
     .click()
     .get(logOutButton)
     .click()
-    .get(allertPopupMessage)
-    .should("contain", "You are now logged out", {timeoout: 20000})
+    .get(allertPopupMessage, { timeout: 3000 })
+    .should("contain", "You are now logged out", { timeoout: 20000 })
 );
diff --git a/package-lock.json b/package-lock.json
index fb1eb2fc42..bb4923cad4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5702,8 +5702,8 @@
       }
     },
     "@saleor/sdk": {
-      "version": "github:mirumee/saleor-sdk#737c63411d80119dfc60fc7dd35a997c51e07d89",
-      "from": "github:mirumee/saleor-sdk#737c634",
+      "version": "github:mirumee/saleor-sdk#a3c0a1fafa149d882e46656accf0384969e3c8fd",
+      "from": "github:mirumee/saleor-sdk#a3c0a1f",
       "requires": {
         "@pollyjs/adapter-node-http": "^4.3.0",
         "@pollyjs/core": "^4.3.0",
@@ -5711,8 +5711,10 @@
         "@types/pollyjs__adapter-node-http": "^2.0.0",
         "@types/pollyjs__persister-fs": "^2.0.0",
         "@types/setup-polly-jest": "^0.5.0",
+        "@types/webappsec-credential-management": "^0.5.1",
         "apollo-cache": "^1.3.5",
         "apollo-cache-inmemory": "^1.6.6",
+        "apollo-cache-persist": "^0.1.1",
         "apollo-link-batch-http": "^1.2.14",
         "apollo-link-context": "^1.0.20",
         "apollo-link-error": "^1.1.13",
@@ -12173,6 +12175,11 @@
       "integrity": "sha512-awrJu8yML4E/xTwr2EMatC+HBnHGoDxc2+ImA9QyeUELI1S7dOCIZcyjki1rkwoA8P2D2NVgLAJLjnclkdLtAw==",
       "dev": true
     },
+    "@types/webappsec-credential-management": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/@types/webappsec-credential-management/-/webappsec-credential-management-0.5.1.tgz",
+      "integrity": "sha512-ZIl4fCJm3mo0jzivFnxhA4qYEY/HicVPxLbcqQTZ3JjnhEFJwYAEPEZft7AJo/MVxHU4mFdAauX+jo+a4m1Qkg=="
+    },
     "@types/webpack": {
       "version": "4.41.2",
       "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.2.tgz",
@@ -16251,9 +16258,9 @@
       "dev": true
     },
     "bowser": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.9.0.tgz",
-      "integrity": "sha512-2ld76tuLBNFekRgmJfT2+3j5MIrP6bFict8WAIT3beq+srz1gcKNAdNKMqHqauQt63NmAa88HfP1/Ypa9Er3HA=="
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.10.0.tgz",
+      "integrity": "sha512-OCsqTQboTEWWsUjcp5jLSw2ZHsBiv2C105iFs61bOT0Hnwi9p7/uuXdd7mu8RYcarREfdjNN+8LitmEHATsLYg=="
     },
     "boxen": {
       "version": "4.2.0",
@@ -44574,7 +44581,7 @@
         },
         "wrap-ansi": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+          "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
           "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
           "requires": {
             "string-width": "^1.0.1",
@@ -44597,7 +44604,7 @@
             },
             "strip-ansi": {
               "version": "3.0.1",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+              "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
               "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
               "requires": {
                 "ansi-regex": "^2.0.0"
diff --git a/package.json b/package.json
index 1ec46fee47..f9aa082f66 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@babel/runtime": "^7.5.5",
     "@lhci/cli": "^0.4.1",
-    "@saleor/sdk": "github:mirumee/saleor-sdk#737c634",
+    "@saleor/sdk": "github:mirumee/saleor-sdk#a3c0a1f",
     "@sentry/apm": "^5.15.5",
     "@sentry/browser": "^5.15.5",
     "@stripe/react-stripe-js": "^1.1.2",
diff --git a/src/@next/components/molecules/AccountTabTiles/AccountTile.tsx b/src/@next/components/molecules/AccountTabTiles/AccountTile.tsx
index 6b8fadbc3f..f1be5544b0 100644
--- a/src/@next/components/molecules/AccountTabTiles/AccountTile.tsx
+++ b/src/@next/components/molecules/AccountTabTiles/AccountTile.tsx
@@ -2,7 +2,7 @@ import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 
 import { commonMessages } from "@temp/intl";
-import { useAccountUpdate, useUserDetails } from "@saleor/sdk";
+import { useAccountUpdate, useAuth } from "@saleor/sdk";
 
 import { Attribute, IconButton, Tile } from "@components/atoms";
 
@@ -12,8 +12,8 @@ import * as S from "./styles";
 export const AccountTile: React.FC = () => {
   const [isEditing, setIsEditing] = React.useState(false);
   const [setAccountUpdate, { data, error }] = useAccountUpdate();
-  const { data: user } = useUserDetails();
   const intl = useIntl();
+  const { user } = useAuth();
 
   React.useEffect(() => {
     if (data && !error) {
diff --git a/src/@next/components/molecules/AccountTabTiles/test.tsx b/src/@next/components/molecules/AccountTabTiles/test.tsx
index ca79778be3..6929703e47 100644
--- a/src/@next/components/molecules/AccountTabTiles/test.tsx
+++ b/src/@next/components/molecules/AccountTabTiles/test.tsx
@@ -10,8 +10,8 @@ import { PasswordTile } from "./PasswordTile";
 
 jest.mock("@saleor/sdk", () => ({
   useAccountUpdate: () => [jest.fn(), { data: null, error: null }],
+  useAuth: () => ({ user: { firstName: "John", lastName: "Doe" } }),
   usePasswordChange: () => [jest.fn(), { data: null, error: null }],
-  useUserDetails: () => ({ data: { firstName: "John", lastName: "Doe" } }),
 }));
 
 describe("<PasswordTile />", () => {
diff --git a/src/@next/pages/CartPage/CartPage.tsx b/src/@next/pages/CartPage/CartPage.tsx
index 1ebb9cda16..170d6ea697 100755
--- a/src/@next/pages/CartPage/CartPage.tsx
+++ b/src/@next/pages/CartPage/CartPage.tsx
@@ -1,4 +1,4 @@
-import { useCart, useCheckout, useUserDetails } from "@saleor/sdk";
+import { useAuth, useCart, useCheckout } from "@saleor/sdk";
 import { History } from "history";
 import React from "react";
 import { FormattedMessage } from "react-intl";
@@ -31,7 +31,7 @@ const getShoppingButton = (history: History) => (
   </Button>
 );
 
-const getCheckoutButton = (history: History, user: UserDetails_me | null) => (
+const getCheckoutButton = (history: History, user?: UserDetails_me | null) => (
   <Button
     testingContext="proceedToCheckoutButton"
     onClick={() => history.push(user ? `/checkout/` : `/login/`)}
@@ -111,7 +111,7 @@ const generateCart = (
 
 export const CartPage: React.FC<IProps> = ({}: IProps) => {
   const history = useHistory();
-  const { data: user } = useUserDetails();
+  const { user } = useAuth();
   const { checkout } = useCheckout();
   const {
     loaded,
diff --git a/src/@next/pages/CheckoutPage/subpages/CheckoutAddressSubpage.tsx b/src/@next/pages/CheckoutPage/subpages/CheckoutAddressSubpage.tsx
index 86c8f9f64f..81aa24ae25 100644
--- a/src/@next/pages/CheckoutPage/subpages/CheckoutAddressSubpage.tsx
+++ b/src/@next/pages/CheckoutPage/subpages/CheckoutAddressSubpage.tsx
@@ -10,7 +10,7 @@ import { useIntl } from "react-intl";
 import { RouteComponentProps, useHistory } from "react-router";
 
 import { CheckoutAddress } from "@components/organisms";
-import { useCheckout, useUserDetails } from "@saleor/sdk";
+import { useAuth, useCheckout } from "@saleor/sdk";
 import { ShopContext } from "@temp/components/ShopProvider/context";
 import { CHECKOUT_STEPS } from "@temp/core/config";
 import { commonMessages } from "@temp/intl";
@@ -49,7 +49,7 @@ const CheckoutAddressSubpageWithRef: RefForwardingComponent<
   }));
 
   const history = useHistory();
-  const { data: user } = useUserDetails();
+  const { user } = useAuth();
   const {
     checkout,
     setShippingAddress,
diff --git a/src/@next/pages/CheckoutPage/subpages/CheckoutPaymentSubpage.tsx b/src/@next/pages/CheckoutPage/subpages/CheckoutPaymentSubpage.tsx
index f6fc8cd0a1..09e41190d3 100644
--- a/src/@next/pages/CheckoutPage/subpages/CheckoutPaymentSubpage.tsx
+++ b/src/@next/pages/CheckoutPage/subpages/CheckoutPaymentSubpage.tsx
@@ -11,7 +11,7 @@ import { useIntl } from "react-intl";
 import { RouteComponentProps, useHistory } from "react-router";
 
 import { CheckoutPayment } from "@components/organisms";
-import { useCart, useCheckout, useUserDetails } from "@saleor/sdk";
+import { useAuth, useCart, useCheckout } from "@saleor/sdk";
 import { ShopContext } from "@temp/components/ShopProvider/context";
 import { CHECKOUT_STEPS } from "@temp/core/config";
 import { commonMessages } from "@temp/intl";
@@ -42,7 +42,7 @@ const CheckoutPaymentSubpageWithRef: RefForwardingComponent<
   ref
 ) => {
   const history = useHistory();
-  const { data: user } = useUserDetails();
+  const { user } = useAuth();
   const {
     checkout,
     billingAsShipping,
diff --git a/src/components/CheckoutLogin/index.tsx b/src/components/CheckoutLogin/index.tsx
index d05fe4ba1d..712ce1c35d 100644
--- a/src/components/CheckoutLogin/index.tsx
+++ b/src/components/CheckoutLogin/index.tsx
@@ -3,7 +3,7 @@ import "./scss/index.scss";
 import React, { useContext, useState } from "react";
 import { Redirect } from "react-router";
 
-import { useUserDetails } from "@saleor/sdk";
+import { useAuth } from "@saleor/sdk";
 
 import { Offline, OfflinePlaceholder, Online, OverlayContext } from "..";
 
@@ -14,7 +14,7 @@ import SignInForm from "./SignInForm";
 const CheckoutLogin: React.FC<{}> = () => {
   const [resetPassword, setResetPassword] = useState(false);
   const overlay = useContext(OverlayContext);
-  const { data: user } = useUserDetails();
+  const { user } = useAuth();
   if (user) {
     return <Redirect to="/checkout/" />;
   }
diff --git a/src/components/LoginForm/index.tsx b/src/components/LoginForm/index.tsx
index f1398f0ef8..4ae1b34f7b 100644
--- a/src/components/LoginForm/index.tsx
+++ b/src/components/LoginForm/index.tsx
@@ -3,10 +3,9 @@ import "./scss/index.scss";
 import * as React from "react";
 import { useIntl } from "react-intl";
 
-import { useSignIn } from "@saleor/sdk";
+import { useAuth } from "@saleor/sdk";
 import { demoMode } from "@temp/constants";
 import { commonMessages } from "@temp/intl";
-import { maybe } from "@utils/misc";
 
 import { Button, Form, TextField } from "..";
 
@@ -15,12 +14,19 @@ interface ILoginForm {
 }
 
 const LoginForm: React.FC<ILoginForm> = ({ hide }) => {
-  const [signIn, { loading, error }] = useSignIn();
+  const { signIn } = useAuth();
+  const [loading, setLoading] = React.useState(false);
+  const [errors, setErrors] = React.useState(null);
 
   const handleOnSubmit = async (evt, { email, password }) => {
     evt.preventDefault();
-    const authenticated = await signIn({ email, password });
-    if (authenticated && hide) {
+    setLoading(true);
+    const { data, dataError } = await signIn(email, password);
+    setLoading(false);
+    if (dataError?.error) {
+      setErrors(dataError.error);
+    } else if (data && hide) {
+      setErrors(null);
       hide();
     }
   };
@@ -36,11 +42,7 @@ const LoginForm: React.FC<ILoginForm> = ({ hide }) => {
 
   return (
     <div className="login-form">
-      <Form
-        data={formData}
-        errors={maybe(() => error.extraInfo.userInputErrors, [])}
-        onSubmit={handleOnSubmit}
-      >
+      <Form data={formData} errors={errors || []} onSubmit={handleOnSubmit}>
         <TextField
           name="email"
           autoComplete="email"
diff --git a/src/components/MainMenu/MainMenu.tsx b/src/components/MainMenu/MainMenu.tsx
index 9fee0930c8..1c6df5915e 100644
--- a/src/components/MainMenu/MainMenu.tsx
+++ b/src/components/MainMenu/MainMenu.tsx
@@ -1,7 +1,8 @@
 import React from "react";
 import { FormattedMessage } from "react-intl";
 import { commonMessages } from "@temp/intl";
-import { useCart, useSignOut, useUserDetails } from "@saleor/sdk";
+import { useAuth, useCart } from "@saleor/sdk";
+
 import Media from "react-media";
 import { Link } from "react-router-dom";
 import ReactSVG from "react-svg";
@@ -32,8 +33,7 @@ import {
 import "./scss/index.scss";
 
 const MainMenu: React.FC = () => {
-  const { data: user } = useUserDetails();
-  const [signOut] = useSignOut();
+  const { user, signOut } = useAuth();
   const { items } = useCart();
 
   const handleSignOut = () => {
diff --git a/src/components/OverlayManager/Cart/Cart.tsx b/src/components/OverlayManager/Cart/Cart.tsx
index 045be3709f..bd0ea47578 100644
--- a/src/components/OverlayManager/Cart/Cart.tsx
+++ b/src/components/OverlayManager/Cart/Cart.tsx
@@ -7,7 +7,7 @@ import ReactSVG from "react-svg";
 
 import { TaxedMoney } from "@components/containers";
 import { commonMessages } from "@temp/intl";
-import { useCart, useCheckout, useUserDetails } from "@saleor/sdk";
+import { useAuth, useCart, useCheckout } from "@saleor/sdk";
 
 import {
   Button,
@@ -26,7 +26,7 @@ import cartImg from "../../../images/cart.svg";
 import closeImg from "../../../images/x.svg";
 
 const Cart: React.FC<{ overlay: OverlayContextInterface }> = ({ overlay }) => {
-  const { data: user } = useUserDetails();
+  const { user } = useAuth();
   const { checkout } = useCheckout();
   const {
     items,
diff --git a/src/index.tsx b/src/index.tsx
index 36d8345424..49f08962c1 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,11 +1,8 @@
 import { Integrations as ApmIntegrations } from "@sentry/apm";
 import * as Sentry from "@sentry/browser";
-import { defaultDataIdFromObject, InMemoryCache } from "apollo-cache-inmemory";
-import { persistCache } from "apollo-cache-persist";
 import * as React from "react";
 import { useIntl } from "react-intl";
 import { positions, Provider as AlertProvider, useAlert } from "react-alert";
-import { ApolloProvider } from "react-apollo";
 import { render } from "react-dom";
 import TagManager from "react-gtm-module";
 import { hot } from "react-hot-loader";
@@ -18,14 +15,8 @@ import {
   ServiceWorkerContext,
   ServiceWorkerProvider,
 } from "@components/containers";
-import {
-  authLink,
-  createSaleorClient,
-  fireSignOut,
-  invalidTokenLinkWithTokenHandler,
-  SaleorProvider,
-  useAuth,
-} from "@saleor/sdk";
+import { SaleorProvider, useAuth } from "@saleor/sdk";
+import { ConfigInput } from "@saleor/sdk/lib/types";
 import { defaultTheme, GlobalStyle } from "@styles";
 
 import { App } from "./app";
@@ -40,14 +31,74 @@ import {
 } from "./constants";
 import { history } from "./history";
 
-const cache = new InMemoryCache({
-  dataIdFromObject: obj => {
-    if (obj.__typename === "Shop") {
-      return "shop";
+const SALEOR_CONFIG: ConfigInput = {
+  apiUrl,
+};
+
+const Notifications: React.FC = () => {
+  const alert = useAlert();
+  const intl = useIntl();
+
+  const { updateAvailable } = React.useContext(ServiceWorkerContext);
+
+  React.useEffect(() => {
+    if (updateAvailable) {
+      alert.show(
+        {
+          actionText: intl.formatMessage({ defaultMessage: "Refresh" }),
+          content: intl.formatMessage({
+            defaultMessage:
+              "To update the application to the latest version, please refresh the page!",
+          }),
+          title: intl.formatMessage({
+            defaultMessage: "New version is available!",
+          }),
+        },
+        {
+          onClose: () => {
+            location.reload();
+          },
+          timeout: 0,
+          type: "success",
+        }
+      );
     }
-    return defaultDataIdFromObject(obj);
-  },
-});
+  }, [updateAvailable]);
+
+  const { authenticated } = useAuth();
+  const [prevAuthenticated, setPrevAuthenticated] = React.useState<
+    boolean | undefined
+  >();
+
+  React.useEffect(() => {
+    if (prevAuthenticated !== undefined && authenticated !== undefined) {
+      if (!prevAuthenticated && authenticated) {
+        alert.show(
+          {
+            title: intl.formatMessage({
+              defaultMessage: "You are now logged in",
+            }),
+          },
+          { type: "success" }
+        );
+      } else if (prevAuthenticated && !authenticated) {
+        alert.show(
+          {
+            title: intl.formatMessage({
+              defaultMessage: "You are now logged out",
+            }),
+          },
+          { type: "success" }
+        );
+      }
+      setPrevAuthenticated(authenticated);
+    } else if (authenticated !== undefined) {
+      setPrevAuthenticated(authenticated);
+    }
+  }, [authenticated]);
+
+  return null;
+};
 
 if (process.env.GTM_ID !== undefined) {
   TagManager.initialize({ gtmId: process.env.GTM_ID });
@@ -62,111 +113,23 @@ const startApp = async () => {
     });
   }
 
-  await persistCache({
-    cache,
-    storage: window.localStorage,
-  });
-
   const notificationOptions = {
     position: positions.BOTTOM_RIGHT,
     timeout: 2500,
   };
 
-  /**
-   * This is temporary adapter for queries and mutations not included in SDK to handle invalid token error for them.
-   * Note, that after all GraphQL queries and mutations will be replaced by SDK methods, this adapter is going to be removed.
-   */
-  const ApolloClientInvalidTokenLinkAdapter: React.FC<{
-    children: (apolloClient) => React.ReactElement;
-  }> = ({ children }) => {
-    const tokenExpirationCallback = () => {
-      fireSignOut(apolloClient);
-    };
-
-    const { link: invalidTokenLink } = invalidTokenLinkWithTokenHandler(
-      tokenExpirationCallback
-    );
-
-    const apolloClient = React.useMemo(
-      () => createSaleorClient(apiUrl, invalidTokenLink, authLink, cache),
-      []
-    );
-
-    return children(apolloClient);
-  };
-
   const Root = hot(module)(() => {
-    const Notifications = () => {
-      const alert = useAlert();
-      const intl = useIntl();
-
-      const { updateAvailable } = React.useContext(ServiceWorkerContext);
-
-      React.useEffect(() => {
-        if (updateAvailable) {
-          alert.show(
-            {
-              actionText: intl.formatMessage({ defaultMessage: "Refresh" }),
-              content: intl.formatMessage({
-                defaultMessage:
-                  "To update the application to the latest version, please refresh the page!",
-              }),
-              title: intl.formatMessage({
-                defaultMessage: "New version is available!",
-              }),
-            },
-            {
-              onClose: () => {
-                location.reload();
-              },
-              timeout: 0,
-              type: "success",
-            }
-          );
-        }
-      }, [updateAvailable]);
-
-      useAuth((authenticated: boolean) => {
-        if (authenticated) {
-          alert.show(
-            {
-              title: intl.formatMessage({
-                defaultMessage: "You are now logged in",
-              }),
-            },
-            { type: "success" }
-          );
-        } else {
-          alert.show(
-            {
-              title: intl.formatMessage({
-                defaultMessage: "You are now logged out",
-              }),
-            },
-            { type: "success" }
-          );
-        }
-      });
-      return null;
-    };
-
     return (
       <Router history={history}>
         <QueryParamProvider ReactRouterRoute={Route}>
-          <ApolloClientInvalidTokenLinkAdapter>
-            {apolloClient => (
-              <ApolloProvider client={apolloClient}>
-                <SaleorProvider client={apolloClient}>
-                  <ShopProvider>
-                    <OverlayProvider>
-                      <App />
-                      <Notifications />
-                    </OverlayProvider>
-                  </ShopProvider>
-                </SaleorProvider>
-              </ApolloProvider>
-            )}
-          </ApolloClientInvalidTokenLinkAdapter>
+          <SaleorProvider config={SALEOR_CONFIG}>
+            <ShopProvider>
+              <OverlayProvider>
+                <App />
+                <Notifications />
+              </OverlayProvider>
+            </ShopProvider>
+          </SaleorProvider>
         </QueryParamProvider>
       </Router>
     );
diff --git a/src/userAccount/components/Authenticated.tsx b/src/userAccount/components/Authenticated.tsx
deleted file mode 100644
index e135bb076e..0000000000
--- a/src/userAccount/components/Authenticated.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from "react";
-
-import { useUserDetails } from "@saleor/sdk";
-
-import { NotFound } from "../../components";
-
-const Authenticated: React.FC<{ children: React.ReactElement }> = ({
-  children,
-}) => {
-  const { data: user } = useUserDetails();
-
-  return user ? children : <NotFound />;
-};
-
-export default Authenticated;
diff --git a/src/userAccount/components/index.ts b/src/userAccount/components/index.ts
deleted file mode 100644
index 1a729f67b8..0000000000
--- a/src/userAccount/components/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as Authenticated } from "./Authenticated";
diff --git a/src/userAccount/views/OrderDetails/View.tsx b/src/userAccount/views/OrderDetails/View.tsx
index 3b803ac1de..4138834adc 100644
--- a/src/userAccount/views/OrderDetails/View.tsx
+++ b/src/userAccount/views/OrderDetails/View.tsx
@@ -4,7 +4,7 @@ import * as React from "react";
 import { RouteComponentProps } from "react-router";
 
 import { Loader } from "@components/atoms";
-import { useOrderDetails, useUserDetails } from "@saleor/sdk";
+import { useAuth, useOrderDetails } from "@saleor/sdk";
 
 import Page from "./Page";
 
@@ -17,7 +17,7 @@ const View: React.FC<RouteComponentProps<{ token?: string }>> = ({
     { token },
     { fetchPolicy: "cache-and-network" }
   );
-  const { data: user } = useUserDetails();
+  const { user } = useAuth();
   const guest = !user;
 
   const handleDownloadInvoice = () => {
diff --git a/src/views/Account/Account.tsx b/src/views/Account/Account.tsx
index 0a2f42734f..bbc8bb946e 100644
--- a/src/views/Account/Account.tsx
+++ b/src/views/Account/Account.tsx
@@ -3,7 +3,7 @@ import { useIntl } from "react-intl";
 import Media from "react-responsive";
 import { RouteComponentProps, withRouter } from "react-router";
 import { commonMessages } from "@temp/intl";
-import { useUserDetails } from "@saleor/sdk";
+import { useAuth } from "@saleor/sdk";
 
 import { smallScreen } from "@styles/constants";
 import { AccountMenu, AccountMenuMobile } from "@components/molecules";
@@ -42,12 +42,12 @@ const returnTab: any = (path: string, userDetails, history) => {
 };
 
 const Account: React.FC<RouteComponentProps> = ({ history, match }) => {
-  const { data: user, loading } = useUserDetails();
   const intl = useIntl();
+  const { user, loaded } = useAuth();
 
   const links = [accountUrl, orderHistoryUrl, addressBookUrl];
 
-  if (loading) {
+  if (!loaded) {
     return <Loader />;
   }