diff --git a/package-lock.json b/package-lock.json
index 9c65401f..76eecbe8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,6 +19,7 @@
         "axios": "^0.21.1",
         "copy-to-clipboard": "^3.3.3",
         "cross-blob": "^3.0.1",
+        "crypto-js": "^4.2.0",
         "ethers": "^5.6.9",
         "file-saver": "^2.0.5",
         "framer-motion": "^10.12.18",
@@ -46,6 +47,7 @@
         "@tailwindcss/aspect-ratio": "^0.2.1",
         "@testing-library/jest-dom": "^5.16.5",
         "@testing-library/react": "^13.4.0",
+        "@types/crypto-js": "^4.2.1",
         "@types/file-saver": "^2.0.5",
         "@types/jest": "^29.5.1",
         "@types/node": "^17.0.9",
@@ -7300,6 +7302,12 @@
         "@types/har-format": "*"
       }
     },
+    "node_modules/@types/crypto-js": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.2.1.tgz",
+      "integrity": "sha512-FSPGd9+OcSok3RsM0UZ/9fcvMOXJ1ENE/ZbLfOPlBWj7BgXtEAM8VYfTtT760GiLbQIMoVozwVuisjvsVwqYWw==",
+      "dev": true
+    },
     "node_modules/@types/debug": {
       "version": "4.1.8",
       "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.8.tgz",
@@ -19733,8 +19741,9 @@
       }
     },
     "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "license": "MIT",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -28232,6 +28241,12 @@
         "@types/har-format": "*"
       }
     },
+    "@types/crypto-js": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.2.1.tgz",
+      "integrity": "sha512-FSPGd9+OcSok3RsM0UZ/9fcvMOXJ1ENE/ZbLfOPlBWj7BgXtEAM8VYfTtT760GiLbQIMoVozwVuisjvsVwqYWw==",
+      "dev": true
+    },
     "@types/debug": {
       "version": "4.1.8",
       "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.8.tgz",
@@ -37017,7 +37032,9 @@
       }
     },
     "readable-stream": {
-      "version": "3.6.0",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "requires": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
diff --git a/package.json b/package.json
index 588a3457..bea7ec89 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "axios": "^0.21.1",
     "copy-to-clipboard": "^3.3.3",
     "cross-blob": "^3.0.1",
+    "crypto-js": "^4.2.0",
     "ethers": "^5.6.9",
     "file-saver": "^2.0.5",
     "framer-motion": "^10.12.18",
@@ -59,6 +60,7 @@
     "@tailwindcss/aspect-ratio": "^0.2.1",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
+    "@types/crypto-js": "^4.2.1",
     "@types/file-saver": "^2.0.5",
     "@types/jest": "^29.5.1",
     "@types/node": "^17.0.9",
diff --git a/src/components/Connect/Metamask/MetamaskConnect.tsx b/src/components/Connect/Metamask/MetamaskConnect.tsx
index 191f85a0..8cd29a1a 100644
--- a/src/components/Connect/Metamask/MetamaskConnect.tsx
+++ b/src/components/Connect/Metamask/MetamaskConnect.tsx
@@ -2,6 +2,8 @@ import { Button } from '@components/Buttons';
 import MetamaskIcon from '@media/UI/metamask.svg';
 import {
   decryptWallet,
+  encryptMnemonic,
+  getBasicSignature,
   getBasicSignatureWallet,
   getMetamaskDeeplinkUrl,
   isMetamaskAvailable,
@@ -9,7 +11,7 @@ import {
 import { useRouter } from 'next/router';
 import { getDefaultNetwork, useFdpStorage } from '@context/FdpStorageContext';
 import MetamaskNotFoundModal from '@components/Modals/MetamaskNotFoundModal/MetamaskNotFoundModal';
-import { useContext, useEffect, useState } from 'react';
+import { useContext, useState } from 'react';
 import UserContext from '@context/UserContext';
 import Spinner from '@components/Spinner/Spinner';
 import { getInvite, login } from '@utils/invite';
@@ -17,6 +19,7 @@ import PasswordModal from '@components/Modals/PasswordModal/PasswordModal';
 import { isMobile } from 'react-device-detect';
 import { useMetamask } from '@context/MetamaskContext';
 import { Network } from '@data/networks';
+import { setMetamaskMnemonic } from '@utils/localStorage';
 
 interface MetamaskConnectProps {
   onConnect: () => void;
@@ -37,8 +40,12 @@ const MetamaskConnect = ({ onConnect }: MetamaskConnectProps) => {
   } = useFdpStorage();
   const { setErrorMessage, setAddress, setMnemonic } = useContext(UserContext);
   const router = useRouter();
-  const { connectMetamask, metamaskProvider, metamaskWalletAddress } =
-    useMetamask();
+  const {
+    loading: metamaskLoading,
+    connectMetamask,
+    metamaskProvider,
+    metamaskWalletAddress,
+  } = useMetamask();
   const [network] = useState<Network>(getDefaultNetwork());
 
   /**
@@ -60,7 +67,10 @@ const MetamaskConnect = ({ onConnect }: MetamaskConnectProps) => {
    *
    * @param password Password from modal input
    */
-  const handlePassword = async (password: string): Promise<void> => {
+  const handlePassword = async (
+    password: string,
+    saveMnemonic: boolean
+  ): Promise<void> => {
     try {
       const wallet = await decryptWallet(localBasicWallet, password);
       const mnemonic = wallet.mnemonic.phrase;
@@ -74,6 +84,17 @@ const MetamaskConnect = ({ onConnect }: MetamaskConnectProps) => {
       setAddress(wallet.address);
       setMnemonic(mnemonic);
 
+      if (saveMnemonic) {
+        const signature = await getBasicSignature(
+          metamaskProvider,
+          metamaskWalletAddress
+        );
+
+        setMetamaskMnemonic(encryptMnemonic(mnemonic, signature));
+      } else {
+        setMetamaskMnemonic('');
+      }
+
       router.push('/drive');
     } catch (error) {
       console.error(error);
@@ -99,45 +120,28 @@ const MetamaskConnect = ({ onConnect }: MetamaskConnectProps) => {
 
     try {
       setLoading(true);
-      await connectMetamask();
+      const { provider, account } = await connectMetamask();
+
+      setLocalBasicWallet(await getBasicSignatureWallet(provider, account));
+
+      setShowPasswordModal(true);
     } catch (error) {
       console.error(error);
       setErrorMessage(String(error.message || error));
+    } finally {
       setLoading(false);
     }
   };
 
-  useEffect(() => {
-    async function run() {
-      if (!(metamaskProvider && metamaskWalletAddress)) {
-        return;
-      }
-
-      try {
-        setLocalBasicWallet(
-          await getBasicSignatureWallet(metamaskProvider, metamaskWalletAddress)
-        );
-
-        setShowPasswordModal(true);
-      } catch (e) {
-        console.error(e);
-      } finally {
-        setLoading(false);
-      }
-    }
-
-    run();
-  }, [metamaskProvider, metamaskWalletAddress]);
-
   return (
     <>
       <Button
         variant="tertiary-outlined"
         className="w-28 h-10 relative text-color-accents-purple-black dark:text-color-accents-grey-lavendar"
         label="Metamask"
-        disabled={loading}
+        disabled={loading || metamaskLoading}
         icon={
-          loading ? (
+          loading || metamaskLoading ? (
             <Spinner className="absolute top-3 left-6" />
           ) : (
             <MetamaskIcon className="inline-block ml-2" />
diff --git a/src/components/Modals/PasswordModal/PasswordModal.tsx b/src/components/Modals/PasswordModal/PasswordModal.tsx
index e41f0a8e..6d7ca43b 100644
--- a/src/components/Modals/PasswordModal/PasswordModal.tsx
+++ b/src/components/Modals/PasswordModal/PasswordModal.tsx
@@ -12,11 +12,12 @@ import {
   getMetamaskPassphraseExplanation,
   setMetamaskPassphraseExplanation,
 } from '@utils/localStorage';
+import CustomCheckbox from '@components/Inputs/CustomCheckbox/CustomCheckbox';
 
 interface PasswordModalProps {
   showModal: boolean;
   closeModal: () => void;
-  handleSubmitForm: (password: string) => Promise<void>;
+  handleSubmitForm: (password: string, save: boolean) => Promise<void>;
 }
 
 const PasswordModal: FC<PasswordModalProps> = ({
@@ -30,12 +31,13 @@ const PasswordModal: FC<PasswordModalProps> = ({
   const { errors } = formState;
   const [loading, setLoading] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
+  const [saveMnemonic, setSaveMnemonic] = useState(true);
   const { intl } = useLocales();
 
   const handleSubmitButton = async (data) => {
     setLoading(true);
     try {
-      await handleSubmitForm(data.password);
+      await handleSubmitForm(data.password, saveMnemonic);
       setMetamaskPassphraseExplanation(false);
       closeModal();
     } catch (e) {
@@ -73,6 +75,16 @@ const PasswordModal: FC<PasswordModalProps> = ({
 
         <p className="text-sm mb-5">{intl.get('PASSPHRASE_EXPLANATION')}</p>
 
+        <div className="flex">
+          <CustomCheckbox
+            className="m-auto mb-8"
+            name="save"
+            checked={saveMnemonic}
+            onChange={() => setSaveMnemonic(!saveMnemonic)}
+          >
+            {intl.get('REMEMBER_ME')}
+          </CustomCheckbox>
+        </div>
         <div className="text-center">
           <Button
             type="submit"
diff --git a/src/context/MetamaskContext.tsx b/src/context/MetamaskContext.tsx
index c1ef3950..865de9d9 100644
--- a/src/context/MetamaskContext.tsx
+++ b/src/context/MetamaskContext.tsx
@@ -1,24 +1,43 @@
-import React, { createContext, useContext, useState } from 'react';
-import { MetaMaskSDK } from '@metamask/sdk';
+import React, { createContext, useContext, useEffect, useState } from 'react';
+import { MetaMaskSDK, SDKProvider } from '@metamask/sdk';
+import { getMetamaskMnemonic } from '@utils/localStorage';
+import { getDefaultNetwork, useFdpStorage } from './FdpStorageContext';
+import UserContext from './UserContext';
+import { decryptMnemonic, getBasicSignature } from '@utils/metamask';
+import { Wallet } from 'ethers';
+import { useRouter } from 'next/router';
 
 /**
  * Metamask context props
  */
 interface MetamaskContextProps {
-  connectMetamask: () => Promise<void>;
+  connectMetamask: () => Promise<{ provider: SDKProvider; account: string }>;
   reset: () => void;
   metamaskWalletAddress: string;
   metamaskProvider: any;
+  loading: boolean;
 }
 
 const MetamaskContext = createContext<MetamaskContextProps | null>(null);
 
 export const MetamaskProvider: React.FC = ({ children }) => {
+  const {
+    fdpClientRef,
+    setIsLoggedIn,
+    setWallet,
+    setFdpStorageType,
+    setLoginType,
+  } = useFdpStorage();
+  const { setAddress, setMnemonic } = useContext(UserContext);
   const [metamaskWalletAddress, setMetamaskWalletAddress] =
     useState<string>('');
   const [metamaskProvider, setMetamaskProvider] = useState<any>(null);
+  const [loading, setLoading] = useState(false);
+  const router = useRouter();
 
-  const connectMetamask = async (name = 'Fairdrive'): Promise<void> => {
+  const connectMetamask = async (
+    name = 'Fairdrive'
+  ): Promise<{ provider: SDKProvider; account: string }> => {
     setMetamaskProvider(null);
     setMetamaskWalletAddress('');
 
@@ -44,10 +63,14 @@ export const MetamaskProvider: React.FC = ({ children }) => {
       throw new Error('No accounts available');
     }
 
-    setMetamaskProvider(
-      window?.ethereum?.isMetaMask ? window?.ethereum : MMSDK.getProvider()
-    );
+    const provider = window?.ethereum?.isMetaMask
+      ? window?.ethereum
+      : MMSDK.getProvider();
+
+    setMetamaskProvider(provider);
     setMetamaskWalletAddress(accounts[0]);
+
+    return { provider, account: accounts[0] };
   };
 
   const reset = () => {
@@ -55,6 +78,39 @@ export const MetamaskProvider: React.FC = ({ children }) => {
     setMetamaskProvider(null);
   };
 
+  const autoLogin = async () => {
+    try {
+      setLoading(true);
+      const { provider, account } = await connectMetamask();
+      const network = getDefaultNetwork();
+      const signature = await getBasicSignature(provider, account);
+      const mnemonic = decryptMnemonic(getMetamaskMnemonic(), signature);
+
+      const wallet = Wallet.fromMnemonic(mnemonic);
+
+      setFdpStorageType('native', network.ensConfig, network.datahubConfig);
+      fdpClientRef.current.account.setAccountFromMnemonic(mnemonic);
+      setIsLoggedIn(true);
+      setLoginType('metamask');
+      setWallet(wallet);
+      setAddress(wallet.address);
+      setMnemonic(mnemonic);
+
+      router.push('/drive');
+    } catch (error) {
+      console.error(error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  useEffect(() => {
+    console.log('MetamaskContext');
+    if (getMetamaskMnemonic()) {
+      autoLogin();
+    }
+  }, []);
+
   return (
     <MetamaskContext.Provider
       value={{
@@ -62,6 +118,7 @@ export const MetamaskProvider: React.FC = ({ children }) => {
         reset,
         metamaskWalletAddress,
         metamaskProvider,
+        loading,
       }}
     >
       {children}
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index b61ee807..b6190b91 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -44,12 +44,12 @@ import { MetamaskProvider } from '@context/MetamaskContext';
 
 function MyApp({ Component, pageProps, router }: AppProps) {
   return (
-    <MetamaskProvider>
-      <LocalesProvider>
+    <LocalesProvider>
+      <UserProvider>
         <FdpStorageProvider>
-          <MatomoProvider>
-            <ThemeProvider>
-              <UserProvider>
+          <MetamaskProvider>
+            <MatomoProvider>
+              <ThemeProvider>
                 <SearchProvider>
                   <PodProvider>
                     <DialogProvider>
@@ -63,12 +63,12 @@ function MyApp({ Component, pageProps, router }: AppProps) {
                     </DialogProvider>
                   </PodProvider>
                 </SearchProvider>
-              </UserProvider>
-            </ThemeProvider>
-          </MatomoProvider>
+              </ThemeProvider>
+            </MatomoProvider>
+          </MetamaskProvider>
         </FdpStorageProvider>
-      </LocalesProvider>
-    </MetamaskProvider>
+      </UserProvider>
+    </LocalesProvider>
   );
 }
 
diff --git a/src/utils/encryption.ts b/src/utils/encryption.ts
new file mode 100644
index 00000000..a8a6b678
--- /dev/null
+++ b/src/utils/encryption.ts
@@ -0,0 +1,58 @@
+import CryptoJS from 'crypto-js';
+
+const IV_LENGTH = 16;
+
+/**
+ * Encrypt WordArray with password
+ *
+ * @param password string for text encryption
+ * @param data WordArray to be encrypted
+ * @param customIv initial vector for AES. In case of absence, a random vector will be created
+ */
+export function encrypt(
+  password: string,
+  data: CryptoJS.lib.WordArray | string,
+  customIv?: CryptoJS.lib.WordArray
+): CryptoJS.lib.WordArray {
+  const iv = customIv || CryptoJS.lib.WordArray.random(IV_LENGTH);
+  const key = CryptoJS.SHA256(password);
+
+  const cipherParams = CryptoJS.AES.encrypt(data, key, {
+    iv,
+    mode: CryptoJS.mode.CFB,
+    padding: CryptoJS.pad.NoPadding,
+  });
+
+  return iv.concat(cipherParams.ciphertext);
+}
+
+/**
+ * Decrypts WordsArray with password
+ *
+ * @param password string to decrypt bytes
+ * @param data WordsArray to be decrypted
+ */
+export function decrypt(
+  password: string,
+  data: CryptoJS.lib.WordArray
+): CryptoJS.lib.WordArray {
+  const wordSize = 4;
+  const key = CryptoJS.SHA256(password);
+  const iv = CryptoJS.lib.WordArray.create(
+    data.words.slice(0, IV_LENGTH),
+    IV_LENGTH
+  );
+  const textBytes = CryptoJS.lib.WordArray.create(
+    data.words.slice(IV_LENGTH / wordSize),
+    data.sigBytes - IV_LENGTH
+  );
+  const cipherParams = CryptoJS.lib.CipherParams.create({
+    ciphertext: textBytes,
+  });
+
+  return CryptoJS.AES.decrypt(cipherParams, key, {
+    iv,
+    mode: CryptoJS.mode.CFB,
+    padding: CryptoJS.pad.NoPadding,
+  });
+}
diff --git a/src/utils/localStorage.ts b/src/utils/localStorage.ts
index aa380836..c1c571c0 100644
--- a/src/utils/localStorage.ts
+++ b/src/utils/localStorage.ts
@@ -2,6 +2,7 @@ export enum LocalStorageKeys {
   NETWORK = 'network',
   METAMASK_MIGRATION_DIALOG = 'metamask-migration-dialog',
   METAMASK_PASSPHRASE_EXPLANATION_HIDE = 'metamask-migration-explanation-hide',
+  METAMASK_MNEMONIC = 'metamask-mnemonic',
 }
 
 /**
@@ -38,3 +39,11 @@ export function getMetamaskPassphraseExplanation(): boolean {
     localStorage.getItem(LocalStorageKeys.METAMASK_PASSPHRASE_EXPLANATION_HIDE)
   );
 }
+
+export function setMetamaskMnemonic(mnemonic: string) {
+  localStorage.setItem(LocalStorageKeys.METAMASK_MNEMONIC, mnemonic);
+}
+
+export function getMetamaskMnemonic(): string {
+  return localStorage.getItem(LocalStorageKeys.METAMASK_MNEMONIC);
+}
diff --git a/src/utils/metamask.ts b/src/utils/metamask.ts
index 8f4056c2..69088c33 100644
--- a/src/utils/metamask.ts
+++ b/src/utils/metamask.ts
@@ -1,6 +1,9 @@
+import { enc } from 'crypto-js';
 import { WindowWithEthereum } from '@interfaces/window';
 import { utils, Wallet } from 'ethers';
 import { extractDeeplinkURL } from '@utils/url';
+import { SDKProvider } from '@metamask/sdk';
+import { decrypt, encrypt } from './encryption';
 
 declare const window: WindowWithEthereum;
 
@@ -59,6 +62,13 @@ export const signatureToWallet = (signature: string): Wallet => {
   return Wallet.fromMnemonic(mnemonic);
 };
 
+export function getBasicSignature(
+  provider: SDKProvider,
+  address: string
+): Promise<string> {
+  return getSignature(provider, address, getSignWalletData(address));
+}
+
 /**
  * Creates a basic wallet using Metamask signature
  *
@@ -71,11 +81,7 @@ export const getBasicSignatureWallet = async (
   address: string,
   password = ''
 ): Promise<Wallet> => {
-  const signature = await getSignature(
-    provider,
-    address,
-    getSignWalletData(address)
-  );
+  const signature = await getBasicSignature(provider, address);
   const wallet = signatureToWallet(signature);
   if (password) {
     return decryptWallet(wallet, password);
@@ -98,6 +104,14 @@ export const decryptWallet = async (wallet: Wallet, password: string) => {
   return signatureToWallet(signature);
 };
 
+export function encryptMnemonic(mnemonic: string, signature: string): string {
+  return enc.Base64.stringify(encrypt(signature, enc.Utf8.parse(mnemonic)));
+}
+
+export function decryptMnemonic(mnemonic: string, signature: string): string {
+  return enc.Utf8.stringify(decrypt(signature, enc.Base64.parse(mnemonic)));
+}
+
 /**
  * Gets a chain ID
  *