diff --git a/apps/laboratory/package.json b/apps/laboratory/package.json
index 5740f4486a..e34be4ddd0 100644
--- a/apps/laboratory/package.json
+++ b/apps/laboratory/package.json
@@ -12,11 +12,13 @@
     "playwright:test:wallet": "playwright test --grep 'connect-qr.spec.ts|wallet.spec.ts'",
     "playwright:test:email": "playwright test --grep 'email.spec.ts'",
     "playwright:test:siwe": "playwright test --grep siwe.spec.ts",
+    "playwright:test:sa": "playwright test --grep smart-account.spec.ts",
     "playwright:test:canary": "playwright test --retries=0 --grep canary.spec.ts --project='Desktop Chrome/wagmi'",
     "playwright:debug": "npm run playwright:test -- --debug",
     "playwright:debug:wallet": "npm run playwright:test:wallet -- --debug",
     "playwright:debug:email": "npm run playwright:test:email -- --debug",
     "playwright:debug:siwe": "npm run playwright:test:siwe -- --debug",
+    "playwright:debug:sa": "npm run playwright:test:sa -- --debug",
     "playwright:debug:canary": "npm run playwright:test:canary -- --debug"
   },
   "dependencies": {
diff --git a/apps/laboratory/src/components/Ethers/EthersTransactionTest.tsx b/apps/laboratory/src/components/Ethers/EthersTransactionTest.tsx
index 0fe9e7cbf5..fe3c347d96 100644
--- a/apps/laboratory/src/components/Ethers/EthersTransactionTest.tsx
+++ b/apps/laboratory/src/components/Ethers/EthersTransactionTest.tsx
@@ -1,7 +1,7 @@
 import { Button, useToast, Stack, Link, Text, Spacer } from '@chakra-ui/react'
 import { useWeb3ModalAccount, useWeb3ModalProvider } from '@web3modal/ethers/react'
 import { BrowserProvider, JsonRpcSigner, ethers } from 'ethers'
-import { sepolia } from '../../utils/ChainsUtil'
+import { sepolia, optimism } from '../../utils/ChainsUtil'
 import { useState } from 'react'
 import { vitalikEthAddress } from '../../utils/DataUtil'
 
@@ -21,9 +21,7 @@ export function EthersTransactionTest() {
       const signer = new JsonRpcSigner(provider, address)
       const tx = await signer.sendTransaction({
         to: vitalikEthAddress,
-        value: ethers.parseUnits('0.0001', 'gwei'),
-        maxFeePerGas: ethers.parseUnits('200', 'gwei'),
-        maxPriorityFeePerGas: ethers.parseUnits('200', 'gwei')
+        value: ethers.parseUnits('0.0001', 'gwei')
       })
       toast({ title: 'Succcess', description: tx.hash, status: 'success', isClosable: true })
     } catch {
@@ -38,7 +36,9 @@ export function EthersTransactionTest() {
     }
   }
 
-  return chainId === sepolia.chainId && address ? (
+  const allowedChains = [sepolia.chainId, optimism.chainId]
+
+  return allowedChains.includes(Number(chainId)) && address ? (
     <Stack direction={['column', 'column', 'row']}>
       <Button
         data-test-id="sign-transaction-button"
@@ -64,7 +64,7 @@ export function EthersTransactionTest() {
     </Stack>
   ) : (
     <Text fontSize="md" color="yellow">
-      Switch to Sepolia Ethereum Testnet to test this feature
+      Switch to Sepolia or OP to test this feature
     </Text>
   )
 }
diff --git a/apps/laboratory/src/components/Ethers/EthersWriteContractTest.tsx b/apps/laboratory/src/components/Ethers/EthersWriteContractTest.tsx
index 4498ab5b74..760e5b0bc2 100644
--- a/apps/laboratory/src/components/Ethers/EthersWriteContractTest.tsx
+++ b/apps/laboratory/src/components/Ethers/EthersWriteContractTest.tsx
@@ -1,7 +1,7 @@
 import { Button, useToast, Stack, Link, Text, Spacer } from '@chakra-ui/react'
 import { useWeb3ModalAccount, useWeb3ModalProvider } from '@web3modal/ethers/react'
 import { BrowserProvider, JsonRpcSigner, ethers } from 'ethers'
-import { sepolia } from '../../utils/ChainsUtil'
+import { optimism, sepolia } from '../../utils/ChainsUtil'
 import { useState } from 'react'
 
 import { abi, address as donutAddress } from '../../utils/DonutContract'
@@ -35,8 +35,9 @@ export function EthersWriteContractTest() {
       setLoading(false)
     }
   }
+  const allowedChains = [sepolia.chainId, optimism.chainId]
 
-  return chainId === sepolia.chainId && address ? (
+  return allowedChains.includes(Number(chainId)) && address ? (
     <Stack direction={['column', 'column', 'row']}>
       <Button
         data-test-id="sign-transaction-button"
@@ -62,7 +63,7 @@ export function EthersWriteContractTest() {
     </Stack>
   ) : (
     <Text fontSize="md" color="yellow">
-      Switch to Sepolia Ethereum Testnet to test this feature
+      Switch to Sepolia or OP to test this feature
     </Text>
   )
 }
diff --git a/apps/laboratory/src/components/Wagmi/WagmiSendUSDCTest.tsx b/apps/laboratory/src/components/Wagmi/WagmiSendUSDCTest.tsx
index 3e215896d1..58385bcb12 100644
--- a/apps/laboratory/src/components/Wagmi/WagmiSendUSDCTest.tsx
+++ b/apps/laboratory/src/components/Wagmi/WagmiSendUSDCTest.tsx
@@ -1,7 +1,7 @@
 import { Button, useToast, Stack, Link, Text, Spacer, Input } from '@chakra-ui/react'
 import { useAccount, useWriteContract } from 'wagmi'
 import { useCallback, useState } from 'react'
-import { sepolia } from 'wagmi/chains'
+import { optimism, sepolia } from 'wagmi/chains'
 
 const minTokenAbi = [
   {
@@ -70,25 +70,27 @@ export function WagmiSendUSDCTest() {
     })
   }, [writeContract, address, amount])
 
-  return chain?.id === sepolia.id && status === 'connected' ? (
+  const allowedChains = [sepolia.id, optimism.id] as number[]
+
+  return allowedChains.includes(Number(chain?.id)) && status === 'connected' ? (
     <Stack direction={['column', 'column', 'row']}>
+      <Spacer />
+      <Input placeholder="0xf34ffa..." onChange={e => setAddress(e.target.value)} value={address} />
+      <Input
+        placeholder="Units (1000000000 for 1 USDC)"
+        onChange={e => setAmount(e.target.value)}
+        value={amount}
+        type="number"
+      />
       <Button
         data-test-id="sign-transaction-button"
         onClick={onSendTransaction}
         disabled={!writeContract}
         isDisabled={isLoading}
+        width="80%"
       >
         Send USDC
       </Button>
-
-      <Spacer />
-      <Input placeholder="0xf34ffa..." onChange={e => setAddress(e.target.value)} value={address} />
-      <Input
-        placeholder="Enter an amount"
-        onChange={e => setAmount(e.target.value)}
-        value={amount}
-        type="number"
-      />
       <Link isExternal href="https://faucet.circle.com">
         <Button variant="outline" colorScheme="blue" isDisabled={isLoading}>
           USDC Faucet
@@ -97,7 +99,7 @@ export function WagmiSendUSDCTest() {
     </Stack>
   ) : (
     <Text fontSize="md" color="yellow">
-      Switch to Sepolia Ethereum Testnet to test this feature
+      Switch to Sepolia or OP to test this feature
     </Text>
   )
 }
diff --git a/apps/laboratory/src/components/Wagmi/WagmiTransactionTest.tsx b/apps/laboratory/src/components/Wagmi/WagmiTransactionTest.tsx
index cd703eb804..9085b4e327 100644
--- a/apps/laboratory/src/components/Wagmi/WagmiTransactionTest.tsx
+++ b/apps/laboratory/src/components/Wagmi/WagmiTransactionTest.tsx
@@ -3,11 +3,11 @@ import { parseGwei, type Address } from 'viem'
 import { useEstimateGas, useSendTransaction, useAccount } from 'wagmi'
 import { vitalikEthAddress } from '../../utils/DataUtil'
 import { useCallback, useState } from 'react'
-import { sepolia } from 'wagmi/chains'
+import { optimism, optimismSepolia, sepolia } from 'wagmi/chains'
 
 const TEST_TX = {
   to: vitalikEthAddress as Address,
-  value: parseGwei('0.3')
+  value: parseGwei('0.001')
 }
 
 export function WagmiTransactionTest() {
@@ -56,7 +56,9 @@ export function WagmiTransactionTest() {
     }
   }, [sendTransaction, prepareError])
 
-  return chain?.id === sepolia.id && status === 'connected' ? (
+  const allowedChains = [sepolia.id, optimism.id, optimismSepolia.id] as number[]
+
+  return allowedChains.includes(Number(chain?.id)) && status === 'connected' ? (
     <Stack direction={['column', 'column', 'row']}>
       <Button
         data-test-id="sign-transaction-button"
@@ -83,7 +85,7 @@ export function WagmiTransactionTest() {
     </Stack>
   ) : (
     <Text fontSize="md" color="yellow">
-      Switch to Sepolia Ethereum Testnet to test this feature
+      Switch to Sepolia or OP to test this feature
     </Text>
   )
 }
diff --git a/apps/laboratory/src/components/Wagmi/WagmiWriteContractTest.tsx b/apps/laboratory/src/components/Wagmi/WagmiWriteContractTest.tsx
index dc0b06aae6..54bd0af3b8 100644
--- a/apps/laboratory/src/components/Wagmi/WagmiWriteContractTest.tsx
+++ b/apps/laboratory/src/components/Wagmi/WagmiWriteContractTest.tsx
@@ -2,7 +2,7 @@ import { Button, useToast, Stack, Link, Text, Spacer, Flex } from '@chakra-ui/re
 import { parseEther } from 'viem'
 import { useAccount, useSimulateContract, useWriteContract, useReadContract } from 'wagmi'
 import { useCallback, useEffect } from 'react'
-import { sepolia } from 'wagmi/chains'
+import { optimism, sepolia } from 'wagmi/chains'
 import { abi, address } from '../../utils/DonutContract'
 
 export function WagmiWriteContractTest() {
@@ -62,7 +62,9 @@ export function WagmiWriteContractTest() {
     reset()
   }, [data, error])
 
-  return chain?.id === sepolia.id && status === 'connected' ? (
+  const allowedChains = [sepolia.id, optimism.id] as number[]
+
+  return allowedChains.includes(Number(chain?.id)) && status === 'connected' ? (
     <Stack direction={['column', 'column', 'row']}>
       <Button
         data-test-id="sign-transaction-button"
@@ -96,7 +98,7 @@ export function WagmiWriteContractTest() {
     </Stack>
   ) : (
     <Text fontSize="md" color="yellow">
-      Switch to Sepolia Ethereum Testnet to test this feature
+      Switch to Sepolia or OP to test this feature
     </Text>
   )
 }
diff --git a/apps/laboratory/src/utils/WagmiConstants.ts b/apps/laboratory/src/utils/WagmiConstants.ts
index cfde830e06..a6b5b97e8b 100644
--- a/apps/laboratory/src/utils/WagmiConstants.ts
+++ b/apps/laboratory/src/utils/WagmiConstants.ts
@@ -12,6 +12,7 @@ import {
   zkSync,
   zora,
   sepolia,
+  optimismSepolia,
   type Chain
 } from 'wagmi/chains'
 
@@ -29,6 +30,7 @@ export const WagmiConstantsUtil = {
     base,
     celo,
     aurora,
-    sepolia
+    sepolia,
+    optimismSepolia
   ] as [Chain, ...Chain[]]
 }
diff --git a/apps/laboratory/tests/shared/fixtures/w3m-smart-account-fixture.ts b/apps/laboratory/tests/shared/fixtures/w3m-smart-account-fixture.ts
new file mode 100644
index 0000000000..5891eb81c6
--- /dev/null
+++ b/apps/laboratory/tests/shared/fixtures/w3m-smart-account-fixture.ts
@@ -0,0 +1,63 @@
+import { test as base } from '@playwright/test'
+import type { ModalFixture } from './w3m-fixture'
+import { DeviceRegistrationPage } from '../pages/DeviceRegistrationPage'
+import { Email } from '../utils/email'
+import { ModalWalletPage } from '../pages/ModalWalletPage'
+import { ModalWalletValidator } from '../validators/ModalWalletValidator'
+
+const mailsacApiKey = process.env['MAILSAC_API_KEY']
+if (!mailsacApiKey) {
+  throw new Error('MAILSAC_API_KEY is not set')
+}
+
+// Test Modal + Smart Account
+export const testModalSmartAccount = base.extend<ModalFixture>({
+  library: ['wagmi', { option: true }],
+  modalPage: async ({ page, library, context }, use, testInfo) => {
+    const modalPage = new ModalWalletPage(page, library)
+    await modalPage.load()
+
+    const email = new Email(mailsacApiKey)
+
+    const tempEmail = email.getEmailAddressToUse(testInfo.parallelIndex)
+
+    await email.deleteAllMessages(tempEmail)
+    await modalPage.loginWithEmail(tempEmail)
+
+    let messageId = await email.getLatestMessageId(tempEmail)
+
+    if (!messageId) {
+      throw new Error('No messageId found')
+    }
+    let emailBody = await email.getEmailBody(tempEmail, messageId)
+    let otp = ''
+    if (email.isApproveEmail(emailBody)) {
+      const url = email.getApproveUrlFromBody(emailBody)
+
+      await email.deleteAllMessages(tempEmail)
+
+      const drp = new DeviceRegistrationPage(await context.newPage(), url)
+      drp.load()
+      await drp.approveDevice()
+      await drp.close()
+
+      messageId = await email.getLatestMessageId(tempEmail)
+
+      emailBody = await email.getEmailBody(tempEmail, messageId)
+      if (!email.isApproveEmail(emailBody)) {
+        otp = email.getOtpCodeFromBody(emailBody)
+      }
+    }
+    if (otp.length !== 6) {
+      otp = email.getOtpCodeFromBody(emailBody)
+    }
+    await modalPage.enterOTP(otp)
+    await modalPage.switchNetwork('Sepolia')
+    await modalPage.page.waitForTimeout(1500)
+    await use(modalPage)
+  },
+  modalValidator: async ({ modalPage }, use) => {
+    const modalValidator = new ModalWalletValidator(modalPage.page)
+    await use(modalValidator)
+  }
+})
diff --git a/apps/laboratory/tests/shared/pages/ModalPage.ts b/apps/laboratory/tests/shared/pages/ModalPage.ts
index ceaf5567b3..0688d6c3b9 100644
--- a/apps/laboratory/tests/shared/pages/ModalPage.ts
+++ b/apps/laboratory/tests/shared/pages/ModalPage.ts
@@ -4,7 +4,7 @@ import { expect } from '@playwright/test'
 import { BASE_URL } from '../constants'
 import { doActionAndWaitForNewPage } from '../utils/actions'
 
-export type ModalFlavor = 'default' | 'siwe' | 'email'
+export type ModalFlavor = 'default' | 'siwe' | 'email' | 'wallet'
 
 export class ModalPage {
   private readonly baseURL = BASE_URL
@@ -166,7 +166,7 @@ export class ModalPage {
     await this.page.getByTestId('account-button').click()
     await this.page.getByTestId('w3m-account-select-network').click()
     await this.page.getByTestId(`w3m-network-switch-${network}`).click()
-    await this.page.getByTestId(`w3m-header-close`).click()
+    await this.page.getByTestId('w3m-header-close').click()
   }
 
   async clickWalletDeeplink() {
@@ -174,4 +174,12 @@ export class ModalPage {
     await this.page.getByTestId('wallet-selector-react-wallet-v2').click()
     await this.page.getByTestId('tab-desktop').click()
   }
+
+  async openAccount() {
+    await this.page.getByTestId('account-button').click()
+  }
+
+  async closeModal() {
+    await this.page.getByTestId('w3m-header-close')?.click?.()
+  }
 }
diff --git a/apps/laboratory/tests/shared/pages/ModalWalletPage.ts b/apps/laboratory/tests/shared/pages/ModalWalletPage.ts
new file mode 100644
index 0000000000..54314aa1af
--- /dev/null
+++ b/apps/laboratory/tests/shared/pages/ModalWalletPage.ts
@@ -0,0 +1,32 @@
+/* eslint-disable no-await-in-loop */
+import type { Page } from '@playwright/test'
+import { ModalPage } from './ModalPage'
+
+export class ModalWalletPage extends ModalPage {
+  constructor(
+    public override readonly page: Page,
+    public override readonly library: string
+  ) {
+    super(page, library, 'wallet')
+  }
+
+  async openSettings() {
+    await this.page.getByTestId('account-button').click()
+    await this.page.getByTestId('wui-profile-button').click()
+  }
+
+  override async switchNetwork(network: string) {
+    await this.openSettings()
+    await this.page.getByTestId('account-switch-network-button').click()
+    await this.page.getByTestId(`w3m-network-switch-${network}`).click()
+    await this.page.getByTestId('w3m-header-close').click()
+    await this.page.waitForTimeout(2000)
+  }
+
+  async togglePreferredAccountType() {
+    await this.openSettings()
+    await this.page.getByTestId('account-toggle-preferred-account-type').click()
+    await this.page.getByTestId('w3m-header-close').click()
+    await this.page.waitForTimeout(2000)
+  }
+}
diff --git a/apps/laboratory/tests/shared/utils/project.ts b/apps/laboratory/tests/shared/utils/project.ts
index aa6ab4efa3..616992431b 100644
--- a/apps/laboratory/tests/shared/utils/project.ts
+++ b/apps/laboratory/tests/shared/utils/project.ts
@@ -18,7 +18,7 @@ interface UseOptions {
 }
 
 interface CustomProperties {
-  testIgnore?: string
+  testIgnore?: RegExp | string
   testMatch?: string
   useOptions?: UseOptions
   grep?: RegExp
@@ -36,32 +36,32 @@ const braveOptions: UseOptions = {
 
 const customProjectProperties: CustomProjectProperties = {
   'Desktop Brave/wagmi': {
-    testIgnore: 'email.spec.ts',
+    testIgnore: /(?:email\.spec\.ts|smart-account\.spec\.ts).*$/u,
     useOptions: braveOptions
   },
   'Desktop Brave/ethers': {
-    testIgnore: 'email.spec.ts',
+    testIgnore: /(?:email\.spec\.ts|smart-account\.spec\.ts).*$/u,
     useOptions: braveOptions
   },
   'Desktop Chrome/wagmi': {
-    testIgnore: 'email.spec.ts'
+    testIgnore: /(?:email\.spec\.ts|smart-account\.spec\.ts).*$/u
   },
   'Desktop Firefox/wagmi': {
-    testIgnore: 'email.spec.ts'
+    testIgnore: /(?:email\.spec\.ts|smart-account\.spec\.ts).*$/u
   },
   // Exclude email.spec.ts, siwe.spec.ts, and canary.spec.ts from solana, not yet implemented
   'Desktop Chrome/solana': {
-    grep: /^(?!.*(?:email\.spec\.ts|siwe\.spec\.ts|canary\.spec\.ts)).*$/u
+    grep: /^(?!.*(?:email\.spec\.ts|siwe\.spec\.ts|canary\.spec\.ts|smart-account\.spec\.ts)).*$/u
   },
   'Desktop Brave/solana': {
     useOptions: braveOptions,
-    grep: /^(?!.*(?:email\.spec\.ts|siwe\.spec\.ts|canary\.spec\.ts)).*$/u
+    grep: /^(?!.*(?:email\.spec\.ts|siwe\.spec\.ts|canary\.spec\.ts|smart-account\.spec\.ts)).*$/u
   },
   'Desktop Firefox/solana': {
-    grep: /^(?!.*(?:email\.spec\.ts|siwe\.spec\.ts|canary\.spec\.ts)).*$/u
+    grep: /^(?!.*(?:email\.spec\.ts|siwe\.spec\.ts|canary\.spec\.ts|smart-account\.spec\.ts)).*$/u
   },
   'Desktop Safari/solana': {
-    grep: /^(?!.*(?:email\.spec\.ts|siwe\.spec\.ts|canary\.spec\.ts)).*$/u
+    grep: /^(?!.*(?:email\.spec\.ts|siwe\.spec\.ts|canary\.spec\.ts|smart-account\.spec\.ts)).*$/u
   }
 }
 
diff --git a/apps/laboratory/tests/shared/validators/ModalWalletValidator.ts b/apps/laboratory/tests/shared/validators/ModalWalletValidator.ts
new file mode 100644
index 0000000000..d3c6525aa4
--- /dev/null
+++ b/apps/laboratory/tests/shared/validators/ModalWalletValidator.ts
@@ -0,0 +1,45 @@
+import { expect } from '@playwright/test'
+import { ModalValidator } from './ModalValidator'
+
+// Each entry corresponds to web3modal${index} email address EOA
+const testEmailsEOAAddresses = [
+  '0x6DAa039A2bFBb48dE6c02E3333a30856C047D73f',
+  '0x804642811117f5063594D0Db0273EA3C1959AE2C',
+  '0x871f447Cc32EA3F28Ea09910BE124c451CCcAE4c',
+  '0xd3041Dbf9473b9D2f6E15EB1Ca2e5999D3eF9519',
+  '0x88dEF109b4877B6fc14c5Fd25ED68B821E270E30',
+  '0x465B06679a2a33F3350C9D245872d1e34f10BA9C',
+  '0x8cD2c90E98309FcdeEd2bA0FdaC050e0284D1fD6',
+  '0x4446d7538f4CF5832604BE20535d954439Ff075d',
+  '0xbC6996C993d358989743bC74082B046da9d4d8fb',
+  '0x1216ff6012bcFcBaDFb4691cF586702Af9482F8C'
+]
+
+function formatAddress(address: string) {
+  return `${address.slice(0, 4)}...${address.slice(-6)}`
+}
+
+export class ModalWalletValidator extends ModalValidator {
+  async expectActivateSmartAccountPromo() {
+    await expect(
+      this.page.getByTestId('activate-smart-account-promo'),
+      'Activate smart account promo should be present'
+    ).toContainText('unauthenticated')
+  }
+
+  async expectSmartAccountAddress(index: number) {
+    const address = this.page.getByTestId('account-settings-address')
+
+    await expect(address, 'Smart account sepolia address should be present').not.toHaveText(
+      formatAddress(testEmailsEOAAddresses[index] || '')
+    )
+  }
+
+  async expectEoaAddress(index: number) {
+    const address = this.page.getByTestId('account-settings-address')
+
+    await expect(address, 'EOA address should be present').toHaveText(
+      formatAddress(testEmailsEOAAddresses[index] || '')
+    )
+  }
+}
diff --git a/apps/laboratory/tests/smart-account.spec.ts b/apps/laboratory/tests/smart-account.spec.ts
new file mode 100644
index 0000000000..fd4dbe2365
--- /dev/null
+++ b/apps/laboratory/tests/smart-account.spec.ts
@@ -0,0 +1,52 @@
+import { testModalSmartAccount } from './shared/fixtures/w3m-smart-account-fixture'
+import type { ModalWalletPage } from './shared/pages/ModalWalletPage'
+import type { ModalWalletValidator } from './shared/validators/ModalWalletValidator'
+
+testModalSmartAccount.beforeEach(async ({ modalValidator }) => {
+  await modalValidator.expectConnected()
+})
+
+testModalSmartAccount('it should sign with eoa', async ({ modalPage, modalValidator }) => {
+  await modalPage.sign()
+  await modalPage.approveSign()
+  await modalValidator.expectAcceptedSign()
+})
+
+testModalSmartAccount(
+  'it should switch to its smart account',
+  async ({ modalPage, modalValidator }, testInfo) => {
+    const walletModalPage = modalPage as ModalWalletPage
+    const walletModalValidator = modalValidator as ModalWalletValidator
+
+    await walletModalPage.togglePreferredAccountType()
+    await walletModalPage.openSettings()
+    await walletModalValidator.expectSmartAccountAddress(testInfo.parallelIndex)
+  }
+)
+
+testModalSmartAccount(
+  'it should sign with its smart account',
+  async ({ modalPage, modalValidator }) => {
+    const walletModalPage = modalPage as ModalWalletPage
+    const walletModalValidator = modalValidator as ModalWalletValidator
+
+    await walletModalPage.togglePreferredAccountType()
+
+    await walletModalPage.sign()
+    await walletModalPage.approveSign()
+    await walletModalValidator.expectAcceptedSign()
+  }
+)
+
+testModalSmartAccount(
+  'it should return to an eoa when switching to a non supported network',
+  async ({ modalPage, modalValidator }, testInfo) => {
+    const walletModalPage = modalPage as ModalWalletPage
+    const walletModalValidator = modalValidator as ModalWalletValidator
+
+    await walletModalPage.togglePreferredAccountType()
+    await walletModalPage.switchNetwork('Polygon')
+    await walletModalPage.openSettings()
+    await walletModalValidator.expectEoaAddress(testInfo.parallelIndex)
+  }
+)
diff --git a/packages/common/index.ts b/packages/common/index.ts
index 7383175e59..cfcb94f0d5 100644
--- a/packages/common/index.ts
+++ b/packages/common/index.ts
@@ -1,4 +1,5 @@
 // -- Utils -------------------------------------------------------------------
 export { DateUtil } from './src/utils/DateUtil.js'
+export { NetworkUtil } from './src/utils/NetworkUtil.js'
 
 export type * from './src/utils/TypeUtil.js'
diff --git a/packages/common/src/utils/NetworkUtil.ts b/packages/common/src/utils/NetworkUtil.ts
new file mode 100644
index 0000000000..1e27aa3230
--- /dev/null
+++ b/packages/common/src/utils/NetworkUtil.ts
@@ -0,0 +1,7 @@
+import type { CaipNetworkId } from '@web3modal/core'
+
+export const NetworkUtil = {
+  caipNetworkIdToNumber(caipnetworkId?: CaipNetworkId) {
+    return caipnetworkId ? Number(caipnetworkId.split(':')[1]) : undefined
+  }
+}
diff --git a/packages/core/src/controllers/NetworkController.ts b/packages/core/src/controllers/NetworkController.ts
index c5dcbb6134..dd239cc187 100644
--- a/packages/core/src/controllers/NetworkController.ts
+++ b/packages/core/src/controllers/NetworkController.ts
@@ -1,10 +1,11 @@
-import { subscribeKey as subKey } from 'valtio/vanilla/utils'
-import { proxy, ref } from 'valtio/vanilla'
+import { subscribeKey as subKey } from 'valtio/utils'
+import { proxy, ref, subscribe as sub } from 'valtio/vanilla'
 import type { CaipNetwork, CaipNetworkId } from '../utils/TypeUtil.js'
 import { PublicStateController } from './PublicStateController.js'
 import { EventsController } from './EventsController.js'
 import { ModalController } from './ModalController.js'
 import { CoreHelperUtil } from '../utils/CoreHelperUtil.js'
+import { NetworkUtil } from '@web3modal/common'
 
 // -- Types --------------------------------------------- //
 export interface NetworkControllerClient {
@@ -24,6 +25,7 @@ export interface NetworkControllerState {
   requestedCaipNetworks?: CaipNetwork[]
   approvedCaipNetworkIds?: CaipNetworkId[]
   allowUnsupportedChain?: boolean
+  smartAccountEnabledNetworks?: number[]
 }
 
 type StateKey = keyof NetworkControllerState
@@ -38,6 +40,10 @@ const state = proxy<NetworkControllerState>({
 export const NetworkController = {
   state,
 
+  subscribe(callback: (newState: NetworkControllerState) => void) {
+    return sub(state, () => callback(state))
+  },
+
   subscribeKey<K extends StateKey>(key: K, callback: (value: NetworkControllerState[K]) => void) {
     return subKey(state, key, callback)
   },
@@ -76,6 +82,12 @@ export const NetworkController = {
     state.allowUnsupportedChain = allowUnsupportedChain
   },
 
+  setSmartAccountEnabledNetworks(
+    smartAccountEnabledNetworks: NetworkControllerState['smartAccountEnabledNetworks']
+  ) {
+    state.smartAccountEnabledNetworks = smartAccountEnabledNetworks
+  },
+
   getRequestedCaipNetworks() {
     const { approvedCaipNetworkIds, requestedCaipNetworks } = state
 
@@ -114,6 +126,15 @@ export const NetworkController = {
     }
   },
 
+  checkIfSmartAccountEnabled() {
+    const networkId = NetworkUtil.caipNetworkIdToNumber(state.caipNetwork?.id)
+    if (!networkId) {
+      return false
+    }
+
+    return Boolean(state.smartAccountEnabledNetworks?.includes(networkId))
+  },
+
   resetNetwork() {
     if (!state.isDefaultCaipNetwork) {
       state.caipNetwork = undefined
diff --git a/packages/core/src/utils/ConstantsUtil.ts b/packages/core/src/utils/ConstantsUtil.ts
index 0035451b5b..52714f1064 100644
--- a/packages/core/src/utils/ConstantsUtil.ts
+++ b/packages/core/src/utils/ConstantsUtil.ts
@@ -35,9 +35,6 @@ export const ConstantsUtil = {
     'ASIA/HARBIN'
   ],
 
-  CONNECTOR_RDNS_MAP: {
-    coinbaseWallet: 'com.coinbase.wallet'
-  } as Record<string, string>,
   /**
    * Network name to Coinbase Pay SDK chain name map object
    * @see supported chain names on Coinbase for Pay SDK: https://github.com/coinbase/cbpay-js/blob/d4bda2c05c4d5917c8db6a05476b603546046394/src/types/onramp.ts
diff --git a/packages/ethers/src/client.ts b/packages/ethers/src/client.ts
index f5a322b2d6..5f0449a0d1 100644
--- a/packages/ethers/src/client.ts
+++ b/packages/ethers/src/client.ts
@@ -37,6 +37,7 @@ import type { EthereumProviderOptions } from '@walletconnect/ethereum-provider'
 import type { Eip1193Provider } from 'ethers'
 import { W3mFrameProvider, W3mFrameHelpers, W3mFrameRpcConstants } from '@web3modal/wallet'
 import type { CombinedProvider } from '@web3modal/scaffold-utils/ethers'
+import { NetworkUtil } from '@web3modal/common'
 
 // -- Types ---------------------------------------------------------------------
 export interface Web3ModalClientOptions extends Omit<LibraryOptions, 'defaultChain' | 'tokens'> {
@@ -47,7 +48,6 @@ export interface Web3ModalClientOptions extends Omit<LibraryOptions, 'defaultCha
   chainImages?: Record<number, string>
   connectorImages?: Record<string, string>
   tokens?: Record<number, Token>
-  enableSmartAccounts?: boolean
 }
 
 export type Web3ModalOptions = Omit<Web3ModalClientOptions, '_sdkVersion'>
@@ -121,7 +121,7 @@ export class Web3Modal extends Web3ModalScaffold {
 
     const networkControllerClient: NetworkControllerClient = {
       switchCaipNetwork: async caipNetwork => {
-        const chainId = HelpersUtil.caipNetworkIdToNumber(caipNetwork?.id)
+        const chainId = NetworkUtil.caipNetworkIdToNumber(caipNetwork?.id)
         if (chainId) {
           try {
             EthersStoreUtil.setError(undefined)
@@ -334,7 +334,7 @@ export class Web3Modal extends Web3ModalScaffold {
 
     return {
       ...state,
-      selectedNetworkId: HelpersUtil.caipNetworkIdToNumber(state.selectedNetworkId)
+      selectedNetworkId: NetworkUtil.caipNetworkIdToNumber(state.selectedNetworkId)
     }
   }
 
@@ -343,7 +343,7 @@ export class Web3Modal extends Web3ModalScaffold {
     return super.subscribeState(state =>
       callback({
         ...state,
-        selectedNetworkId: HelpersUtil.caipNetworkIdToNumber(state.selectedNetworkId)
+        selectedNetworkId: NetworkUtil.caipNetworkIdToNumber(state.selectedNetworkId)
       })
     )
   }
@@ -585,40 +585,28 @@ export class Web3Modal extends Web3ModalScaffold {
     }
   }
 
-  private async initSmartAccount(
-    chainId: number
-  ): Promise<{ isDeployed: boolean; address?: string }> {
-    if (!this.emailProvider || !this.options?.enableSmartAccounts) {
-      return { isDeployed: false }
-    }
-    const { smartAccountEnabledNetworks } =
-      await this.emailProvider.getSmartAccountEnabledNetworks()
-
-    if (!smartAccountEnabledNetworks.includes(chainId)) {
-      return { isDeployed: false }
-    }
-
-    return await this.emailProvider.initSmartAccount()
-  }
-
   private async setEmailProvider() {
     window?.localStorage.setItem(EthersConstantsUtil.WALLET_ID, ConstantsUtil.EMAIL_CONNECTOR_ID)
 
     if (this.emailProvider) {
-      const { address, chainId } = await this.emailProvider.connect()
+      const preferredAccountType = W3mFrameHelpers.getPreferredAccountType()
+      const [{ address, chainId, smartAccountDeployed }, { smartAccountEnabledNetworks }] =
+        await Promise.all([
+          this.emailProvider.connect({
+            chainId: this.getChainId(),
+            preferredAccountType
+          }),
+          this.emailProvider.getSmartAccountEnabledNetworks()
+        ])
       super.setLoading(false)
       if (address && chainId) {
         EthersStoreUtil.setChainId(chainId)
         EthersStoreUtil.setProviderType(ConstantsUtil.EMAIL_CONNECTOR_ID as 'w3mEmail')
         EthersStoreUtil.setProvider(this.emailProvider as unknown as CombinedProvider)
         EthersStoreUtil.setIsConnected(true)
-        const { isDeployed, address: smartAccountAddress } = await this.initSmartAccount(chainId)
-        this.setSmartAccountDeployed(isDeployed)
-        if (isDeployed && smartAccountAddress) {
-          EthersStoreUtil.setAddress(smartAccountAddress as Address)
-        } else {
-          EthersStoreUtil.setAddress(address as Address)
-        }
+        EthersStoreUtil.setAddress(address as Address)
+        this.setSmartAccountDeployed(Boolean(smartAccountDeployed))
+        this.setSmartAccountEnabledNetworks(smartAccountEnabledNetworks)
 
         this.watchEmail()
         this.watchModal()
@@ -798,8 +786,20 @@ export class Web3Modal extends Web3ModalScaffold {
         super.setLoading(false)
       })
       this.emailProvider.onIsConnected(() => {
+        this.setIsConnected(true)
         super.setLoading(false)
       })
+
+      this.emailProvider.onSetPreferredAccount(({ address }) => {
+        if (!address) {
+          return
+        }
+        const chainId = NetworkUtil.caipNetworkIdToNumber(this.getCaipNetwork()?.id)
+        EthersStoreUtil.setAddress(address as Address)
+        EthersStoreUtil.setChainId(chainId)
+        EthersStoreUtil.setIsConnected(true)
+        this.syncAccount()
+      })
     }
   }
 
@@ -1057,8 +1057,18 @@ export class Web3Modal extends Web3ModalScaffold {
       } else if (providerType === ConstantsUtil.EMAIL_CONNECTOR_ID) {
         if (this.emailProvider && chain?.chainId) {
           try {
-            await this.emailProvider?.switchNetwork(chain?.chainId)
+            await this.emailProvider.switchNetwork(chain?.chainId)
             EthersStoreUtil.setChainId(chain.chainId)
+
+            this.emailProvider
+              .connect({
+                chainId: chain?.chainId,
+                preferredAccountType: W3mFrameHelpers.getPreferredAccountType()
+              })
+              .then(({ address }) => {
+                EthersStoreUtil.setAddress(address as Address)
+                this.syncAccount()
+              })
           } catch {
             throw new Error('Switching chain failed')
           }
diff --git a/packages/ethers5/src/client.ts b/packages/ethers5/src/client.ts
index de09b66a12..0202fa8407 100644
--- a/packages/ethers5/src/client.ts
+++ b/packages/ethers5/src/client.ts
@@ -29,6 +29,7 @@ import {
   EthersStoreUtil
 } from '@web3modal/scaffold-utils/ethers'
 import type { EthereumProviderOptions } from '@walletconnect/ethereum-provider'
+import { NetworkUtil } from '@web3modal/common'
 
 // -- Types ---------------------------------------------------------------------
 export interface Web3ModalClientOptions extends Omit<LibraryOptions, 'defaultChain' | 'tokens'> {
@@ -110,7 +111,7 @@ export class Web3Modal extends Web3ModalScaffold {
 
     const networkControllerClient: NetworkControllerClient = {
       switchCaipNetwork: async caipNetwork => {
-        const chainId = HelpersUtil.caipNetworkIdToNumber(caipNetwork?.id)
+        const chainId = NetworkUtil.caipNetworkIdToNumber(caipNetwork?.id)
         if (chainId) {
           try {
             EthersStoreUtil.setError(undefined)
@@ -312,7 +313,7 @@ export class Web3Modal extends Web3ModalScaffold {
 
     return {
       ...state,
-      selectedNetworkId: HelpersUtil.caipNetworkIdToNumber(state.selectedNetworkId)
+      selectedNetworkId: NetworkUtil.caipNetworkIdToNumber(state.selectedNetworkId)
     }
   }
 
@@ -321,7 +322,7 @@ export class Web3Modal extends Web3ModalScaffold {
     return super.subscribeState(state =>
       callback({
         ...state,
-        selectedNetworkId: HelpersUtil.caipNetworkIdToNumber(state.selectedNetworkId)
+        selectedNetworkId: NetworkUtil.caipNetworkIdToNumber(state.selectedNetworkId)
       })
     )
   }
diff --git a/packages/scaffold-utils/src/ConstantsUtil.ts b/packages/scaffold-utils/src/ConstantsUtil.ts
index 560d3662bf..b9b0a0aad1 100644
--- a/packages/scaffold-utils/src/ConstantsUtil.ts
+++ b/packages/scaffold-utils/src/ConstantsUtil.ts
@@ -11,5 +11,8 @@ export const ConstantsUtil = {
   ADD_CHAIN_METHOD: 'wallet_addEthereumChain',
   EIP6963_ANNOUNCE_EVENT: 'eip6963:announceProvider',
   EIP6963_REQUEST_EVENT: 'eip6963:requestProvider',
+  CONNECTOR_RDNS_MAP: {
+    coinbaseWallet: 'com.coinbase.wallet'
+  } as Record<string, string>,
   VERSION: '4.1.3-5f2ae345.1'
 }
diff --git a/packages/scaffold-utils/src/HelpersUtil.ts b/packages/scaffold-utils/src/HelpersUtil.ts
index 03a78a14b5..0d13e2abcc 100644
--- a/packages/scaffold-utils/src/HelpersUtil.ts
+++ b/packages/scaffold-utils/src/HelpersUtil.ts
@@ -1,10 +1,7 @@
-import type { CaipNetworkId, Tokens } from '@web3modal/core'
+import type { Tokens } from '@web3modal/core'
 import { ConstantsUtil } from './ConstantsUtil.js'
 
 export const HelpersUtil = {
-  caipNetworkIdToNumber(caipnetworkId?: CaipNetworkId) {
-    return caipnetworkId ? Number(caipnetworkId.split(':')[1]) : undefined
-  },
   getCaipTokens(tokens?: Tokens) {
     if (!tokens) {
       return undefined
diff --git a/packages/scaffold/src/client.ts b/packages/scaffold/src/client.ts
index 76be63051c..3dd28bdf2f 100644
--- a/packages/scaffold/src/client.ts
+++ b/packages/scaffold/src/client.ts
@@ -221,6 +221,11 @@ export class Web3ModalScaffold {
       AccountController.setConnectedWalletInfo(connectedWalletInfo)
     }
 
+  protected setSmartAccountEnabledNetworks: (typeof NetworkController)['setSmartAccountEnabledNetworks'] =
+    smartAccountEnabledNetworks => {
+      NetworkController.setSmartAccountEnabledNetworks(smartAccountEnabledNetworks)
+    }
+
   // -- Private ------------------------------------------------------------------
   private async initControllers(options: ScaffoldOptions) {
     NetworkController.setClient(options.networkControllerClient)
diff --git a/packages/scaffold/src/partials/w3m-account-default-widget/index.ts b/packages/scaffold/src/partials/w3m-account-default-widget/index.ts
index edde06aa1b..8703f0af4b 100644
--- a/packages/scaffold/src/partials/w3m-account-default-widget/index.ts
+++ b/packages/scaffold/src/partials/w3m-account-default-widget/index.ts
@@ -27,7 +27,7 @@ export class W3mAccountDefaultWidget extends LitElement {
   private unsubscribe: (() => void)[] = []
 
   // -- State & Properties -------------------------------- //
-  @state() private address = AccountController.state.address
+  @state() public address = AccountController.state.address
 
   @state() private profileImage = AccountController.state.profileImage
 
diff --git a/packages/scaffold/src/partials/w3m-account-wallet-features-widget/index.ts b/packages/scaffold/src/partials/w3m-account-wallet-features-widget/index.ts
index f98893e3c5..047b8dbfd1 100644
--- a/packages/scaffold/src/partials/w3m-account-wallet-features-widget/index.ts
+++ b/packages/scaffold/src/partials/w3m-account-wallet-features-widget/index.ts
@@ -12,6 +12,7 @@ import { state } from 'lit/decorators.js'
 import { ifDefined } from 'lit/directives/if-defined.js'
 import styles from './styles.js'
 import { ConstantsUtil } from '../../utils/ConstantsUtil.js'
+import { W3mFrameHelpers, W3mFrameRpcConstants } from '@web3modal/wallet'
 
 @customElement('w3m-account-wallet-features-widget')
 export class W3mAccountWalletFeaturesWidget extends LitElement {
@@ -27,6 +28,8 @@ export class W3mAccountWalletFeaturesWidget extends LitElement {
 
   @state() private profileName = AccountController.state.profileName
 
+  @state() private smartAccountDeployed = AccountController.state.smartAccountDeployed
+
   @state() private network = NetworkController.state.caipNetwork
 
   @state() private currentTab = AccountController.state.currentTab
@@ -44,15 +47,14 @@ export class W3mAccountWalletFeaturesWidget extends LitElement {
             this.profileName = val.profileName
             this.currentTab = val.currentTab
             this.tokenBalance = val.tokenBalance
+            this.smartAccountDeployed = val.smartAccountDeployed
           } else {
             ModalController.close()
           }
         })
       ],
-      NetworkController.subscribeKey('caipNetwork', val => {
-        if (val?.id) {
-          this.network = val
-        }
+      NetworkController.subscribe(val => {
+        this.network = val.caipNetwork
       })
     )
   }
@@ -75,6 +77,7 @@ export class W3mAccountWalletFeaturesWidget extends LitElement {
       alignItems="center"
       gap="m"
     >
+      ${this.activateAccountTemplate()}
       <wui-profile-button
         @click=${this.onProfileButtonClick.bind(this)}
         address=${ifDefined(this.address)}
@@ -139,6 +142,24 @@ export class W3mAccountWalletFeaturesWidget extends LitElement {
     return html`<wui-balance dollars="0" pennies="00"></wui-balance>`
   }
 
+  private activateAccountTemplate() {
+    const smartAccountEnabled = NetworkController.checkIfSmartAccountEnabled()
+    const preferredAccountType = W3mFrameHelpers.getPreferredAccountType()
+    if (
+      !smartAccountEnabled ||
+      preferredAccountType === W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT ||
+      this.smartAccountDeployed
+    ) {
+      return null
+    }
+
+    return html` <wui-promo
+      text=${'Activate your account'}
+      @click=${this.onUpdateToSmartAccount.bind(this)}
+      data-testid="activate-smart-account-promo"
+    ></wui-promo>`
+  }
+
   private onTabChange(index: number) {
     AccountController.setCurrentTab(index)
   }
@@ -158,6 +179,10 @@ export class W3mAccountWalletFeaturesWidget extends LitElement {
   private onSendClick() {
     RouterController.push('WalletSend')
   }
+
+  private onUpdateToSmartAccount() {
+    RouterController.push('UpgradeToSmartAccount')
+  }
 }
 
 declare global {
diff --git a/packages/scaffold/src/partials/w3m-account-wallet-features-widget/styles.ts b/packages/scaffold/src/partials/w3m-account-wallet-features-widget/styles.ts
index 212d02255a..48127d5def 100644
--- a/packages/scaffold/src/partials/w3m-account-wallet-features-widget/styles.ts
+++ b/packages/scaffold/src/partials/w3m-account-wallet-features-widget/styles.ts
@@ -11,6 +11,10 @@ export default css`
   }
 
   wui-profile-button {
+    margin-top: calc(-1 * var(--wui-spacing-2l));
+  }
+
+  wui-promo + wui-profile-button {
     margin-top: var(--wui-spacing-2l);
   }
 
diff --git a/packages/scaffold/src/views/w3m-account-settings-view/index.ts b/packages/scaffold/src/views/w3m-account-settings-view/index.ts
index 9ac0bf7cf5..2c3cab4794 100644
--- a/packages/scaffold/src/views/w3m-account-settings-view/index.ts
+++ b/packages/scaffold/src/views/w3m-account-settings-view/index.ts
@@ -16,6 +16,7 @@ import { LitElement, html } from 'lit'
 import { state } from 'lit/decorators.js'
 import { ifDefined } from 'lit/directives/if-defined.js'
 import styles from './styles.js'
+import { W3mFrameHelpers, W3mFrameRpcConstants } from '@web3modal/wallet'
 
 @customElement('w3m-account-settings-view')
 export class W3mAccountSettingsView extends LitElement {
@@ -37,6 +38,8 @@ export class W3mAccountSettingsView extends LitElement {
 
   @state() private disconnecting = false
 
+  @state() private loading = false
+
   public constructor() {
     super()
     this.usubscribe.push(
@@ -85,7 +88,7 @@ export class W3mAccountSettingsView extends LitElement {
         ></wui-avatar>
         <wui-flex flexDirection="column" alignItems="center">
           <wui-flex gap="3xs" alignItems="center" justifyContent="center">
-            <wui-text variant="large-600" color="fg-100">
+            <wui-text variant="large-600" color="fg-100" data-testid="account-settings-address">
               ${this.profileName
                 ? UiHelperUtil.getTruncateString({
                     string: this.profileName,
@@ -120,11 +123,13 @@ export class W3mAccountSettingsView extends LitElement {
             imageSrc=${ifDefined(networkImage)}
             ?chevron=${this.isAllowedNetworkSwitch()}
             @click=${this.onNetworks.bind(this)}
+            data-testid="account-switch-network-button"
           >
             <wui-text variant="paragraph-500" color="fg-100">
               ${this.network?.name ?? 'Unknown'}
             </wui-text>
           </wui-list-item>
+          ${this.togglePreferredAccountBtnTemplate()}
           <wui-list-item
             variant="icon"
             iconVariant="overlay"
@@ -183,6 +188,57 @@ export class W3mAccountSettingsView extends LitElement {
     `
   }
 
+  private togglePreferredAccountBtnTemplate() {
+    const networkEnabled = NetworkController.checkIfSmartAccountEnabled()
+    const type = StorageUtil.getConnectedConnector()
+    const emailConnector = ConnectorController.getEmailConnector()
+
+    if (!emailConnector || type !== 'EMAIL' || !networkEnabled) {
+      return null
+    }
+
+    const preferredAccountType = W3mFrameHelpers.getPreferredAccountType()
+    const text =
+      preferredAccountType === W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT
+        ? 'Switch to your EOA'
+        : 'Switch to your smart account'
+
+    return html`
+      <wui-list-item
+        variant="icon"
+        iconVariant="overlay"
+        icon="swapHorizontalBold"
+        iconSize="sm"
+        ?chevron=${true}
+        ?loading=${this.loading}
+        @click=${this.changePreferredAccountType.bind(this)}
+        data-testid="account-toggle-preferred-account-type"
+      >
+        <wui-text variant="paragraph-500" color="fg-100">${text}</wui-text>
+      </wui-list-item>
+    `
+  }
+
+  private async changePreferredAccountType() {
+    const smartAccountEnabled = NetworkController.checkIfSmartAccountEnabled()
+    const preferredAccountType = W3mFrameHelpers.getPreferredAccountType()
+    const accountTypeTarget =
+      preferredAccountType === W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT ||
+      !smartAccountEnabled
+        ? W3mFrameRpcConstants.ACCOUNT_TYPES.EOA
+        : W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT
+    const emailConnector = ConnectorController.getEmailConnector()
+
+    if (!emailConnector) {
+      return
+    }
+
+    this.loading = true
+    await emailConnector?.provider.setPreferredAccount(accountTypeTarget)
+    this.loading = false
+    this.requestUpdate()
+  }
+
   private onGoToUpdateEmail(email: string) {
     RouterController.push('UpdateEmailWallet', { email })
   }
diff --git a/packages/scaffold/src/views/w3m-connect-view/index.ts b/packages/scaffold/src/views/w3m-connect-view/index.ts
index 1cf71847e6..af8ffb401e 100644
--- a/packages/scaffold/src/views/w3m-connect-view/index.ts
+++ b/packages/scaffold/src/views/w3m-connect-view/index.ts
@@ -4,7 +4,6 @@ import {
   AssetUtil,
   ConnectionController,
   ConnectorController,
-  ConstantsUtil,
   CoreHelperUtil,
   EventsController,
   OptionsController,
@@ -16,6 +15,7 @@ import { LitElement, html } from 'lit'
 import { state } from 'lit/decorators.js'
 import { ifDefined } from 'lit/directives/if-defined.js'
 import styles from './styles.js'
+import { ConstantsUtil } from '@web3modal/scaffold-utils'
 
 @customElement('w3m-connect-view')
 export class W3mConnectView extends LitElement {
diff --git a/packages/scaffold/src/views/w3m-email-verify-otp-view/index.ts b/packages/scaffold/src/views/w3m-email-verify-otp-view/index.ts
index e6060a09bb..669feda9dd 100644
--- a/packages/scaffold/src/views/w3m-email-verify-otp-view/index.ts
+++ b/packages/scaffold/src/views/w3m-email-verify-otp-view/index.ts
@@ -1,27 +1,53 @@
 import { customElement } from '@web3modal/ui'
 import { W3mEmailOtpWidget } from '../../utils/w3m-email-otp-widget/index.js'
 import type { OnOtpSubmitFn, OnOtpResendFn } from '../../utils/w3m-email-otp-widget/index.js'
-import { EventsController, ConnectionController, ModalController } from '@web3modal/core'
+import {
+  EventsController,
+  ConnectionController,
+  ModalController,
+  NetworkController,
+  RouterController,
+  AccountController
+} from '@web3modal/core'
+import { state } from 'lit/decorators.js'
 
 @customElement('w3m-email-verify-otp-view')
 export class W3mEmailVerifyOtpView extends W3mEmailOtpWidget {
+  // -- Members ------------------------------------------- //
+  private unsubscribe: (() => void)[] = []
+
+  // -- State ------------------------------------------- //
+  @state() private smartAccountDeployed = AccountController.state.smartAccountDeployed
+
   public constructor() {
     super()
+
+    this.unsubscribe.push(
+      AccountController.subscribeKey('smartAccountDeployed', val => {
+        this.smartAccountDeployed = val
+      })
+    )
   }
 
   // --  Private ------------------------------------------ //
   override onOtpSubmit: OnOtpSubmitFn = async otp => {
     try {
       if (this.emailConnector) {
+        const smartAccountEnabled = NetworkController.checkIfSmartAccountEnabled()
         await this.emailConnector.provider.connectOtp({ otp })
         EventsController.sendEvent({ type: 'track', event: 'EMAIL_VERIFICATION_CODE_PASS' })
         await ConnectionController.connectExternal(this.emailConnector)
-        ModalController.close()
         EventsController.sendEvent({
           type: 'track',
           event: 'CONNECT_SUCCESS',
           properties: { method: 'email', name: this.emailConnector.name || 'Unknown' }
         })
+
+        if (smartAccountEnabled && !this.smartAccountDeployed) {
+          RouterController.push('UpgradeToSmartAccount')
+        } else {
+          ModalController.close()
+        }
       }
     } catch (error) {
       EventsController.sendEvent({ type: 'track', event: 'EMAIL_VERIFICATION_CODE_FAIL' })
diff --git a/packages/scaffold/src/views/w3m-upgrade-to-smart-account-view/index.ts b/packages/scaffold/src/views/w3m-upgrade-to-smart-account-view/index.ts
index 8af5dd3f0d..c2b6870ac7 100644
--- a/packages/scaffold/src/views/w3m-upgrade-to-smart-account-view/index.ts
+++ b/packages/scaffold/src/views/w3m-upgrade-to-smart-account-view/index.ts
@@ -1,9 +1,16 @@
 import { customElement } from '@web3modal/ui'
-import { RouterController } from '@web3modal/core'
+import { ConnectorController, RouterController, SnackController } from '@web3modal/core'
 import { LitElement, html } from 'lit'
+import { state } from 'lit/decorators.js'
+import { W3mFrameRpcConstants } from '@web3modal/wallet'
 
 @customElement('w3m-upgrade-to-smart-account-view')
 export class W3mUpgradeToSmartAccountView extends LitElement {
+  // -- State & Properties -------------------------------- //
+  @state() private emailConnector = ConnectorController.getEmailConnector()
+
+  @state() private loading = false
+
   // -- Render -------------------------------------------- //
   public override render() {
     return html`
@@ -31,9 +38,9 @@ export class W3mUpgradeToSmartAccountView extends LitElement {
       .padding=${['0', 'xxl', '0', 'xxl'] as const}
     >
       <wui-flex gap="s" alignItems="center" justifyContent="center">
-        <wui-visual name="onrampCard"></wui-visual>
-        <wui-visual name="onrampCard"></wui-visual>
-        <wui-visual name="onrampCard"></wui-visual>
+        <wui-visual name="google"></wui-visual>
+        <wui-visual name="pencil"></wui-visual>
+        <wui-visual name="lightbulb"></wui-visual>
       </wui-flex>
       <wui-flex flexDirection="column" alignItems="center" gap="s">
         <wui-text align="center" variant="medium-600" color="fg-100">
@@ -49,12 +56,45 @@ export class W3mUpgradeToSmartAccountView extends LitElement {
 
   private buttonsTemplate() {
     return html`<wui-flex .padding=${['0', '2l', '0', '2l'] as const} gap="s">
-      <wui-button variant="accentBg" @click=${RouterController.goBack} size="lg" borderRadius="xs">
+      <wui-button
+        variant="accentBg"
+        @click=${this.redirectToAccount.bind(this)}
+        size="lg"
+        borderRadius="xs"
+      >
         Do it later
       </wui-button>
-      <wui-button size="lg" borderRadius="xs"> Continue </wui-button>
+      <wui-button
+        .loading=${this.loading}
+        size="lg"
+        borderRadius="xs"
+        @click=${this.setPreferSmartAccount.bind(this)}
+        >Continue
+      </wui-button>
     </wui-flex>`
   }
+
+  private setPreferSmartAccount = async () => {
+    if (this.emailConnector) {
+      try {
+        this.loading = true
+        await this.emailConnector.provider.setPreferredAccount(
+          W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT
+        )
+        await this.emailConnector.provider.connect({
+          preferredAccountType: W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT
+        })
+        this.loading = false
+        RouterController.push('Account')
+      } catch (e) {
+        SnackController.showError('Error upgrading to smart account')
+      }
+    }
+  }
+
+  private redirectToAccount() {
+    RouterController.push('Account')
+  }
 }
 
 declare global {
diff --git a/packages/scaffold/src/views/w3m-wallet-compatible-networks-view/index.ts b/packages/scaffold/src/views/w3m-wallet-compatible-networks-view/index.ts
index 4e301c22de..406fb56a1c 100644
--- a/packages/scaffold/src/views/w3m-wallet-compatible-networks-view/index.ts
+++ b/packages/scaffold/src/views/w3m-wallet-compatible-networks-view/index.ts
@@ -3,6 +3,7 @@ import { customElement } from '@web3modal/ui'
 import { LitElement, html } from 'lit'
 import { ifDefined } from 'lit/directives/if-defined.js'
 import styles from './styles.js'
+import { W3mFrameHelpers, W3mFrameRpcConstants } from '@web3modal/wallet'
 
 @customElement('w3m-wallet-compatible-networks-view')
 export class W3mWalletCompatibleNetworksView extends LitElement {
@@ -25,13 +26,26 @@ export class W3mWalletCompatibleNetworksView extends LitElement {
 
   // -- Private ------------------------------------------- //
   networkTemplate() {
-    const { approvedCaipNetworkIds, requestedCaipNetworks } = NetworkController.state
+    const { approvedCaipNetworkIds, requestedCaipNetworks, caipNetwork } = NetworkController.state
+    const isNetworkEnabledForSmartAccounts = NetworkController.checkIfSmartAccountEnabled()
+    const preferredAccountType = W3mFrameHelpers.getPreferredAccountType()
 
-    const sortedNetworks = CoreHelperUtil.sortRequestedNetworks(
+    let sortedNetworks = CoreHelperUtil.sortRequestedNetworks(
       approvedCaipNetworkIds,
       requestedCaipNetworks
     )
 
+    // For now, each network has a unique account
+    if (
+      isNetworkEnabledForSmartAccounts &&
+      preferredAccountType === W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT
+    ) {
+      if (!caipNetwork) {
+        return null
+      }
+      sortedNetworks = [caipNetwork]
+    }
+
     return sortedNetworks.map(
       network => html`
         <wui-list-network
diff --git a/packages/scaffold/src/views/w3m-wallet-receive-view/index.ts b/packages/scaffold/src/views/w3m-wallet-receive-view/index.ts
index 28ee333c76..43028b66f3 100644
--- a/packages/scaffold/src/views/w3m-wallet-receive-view/index.ts
+++ b/packages/scaffold/src/views/w3m-wallet-receive-view/index.ts
@@ -11,6 +11,7 @@ import { UiHelperUtil, customElement } from '@web3modal/ui'
 import { LitElement, html } from 'lit'
 import styles from './styles.js'
 import { state } from 'lit/decorators.js'
+import { W3mFrameHelpers, W3mFrameRpcConstants } from '@web3modal/wallet'
 
 @customElement('w3m-wallet-receive-view')
 export class W3mWalletReceiveView extends LitElement {
@@ -100,6 +101,24 @@ export class W3mWalletReceiveView extends LitElement {
   // -- Private ------------------------------------------- //
   networkTemplate() {
     const networks = NetworkController.getRequestedCaipNetworks()
+    const isNetworkEnabledForSmartAccounts = NetworkController.checkIfSmartAccountEnabled()
+    const caipNetwork = NetworkController.state.caipNetwork
+    const preferredAccountType = W3mFrameHelpers.getPreferredAccountType()
+
+    if (
+      preferredAccountType === W3mFrameRpcConstants.ACCOUNT_TYPES.SMART_ACCOUNT &&
+      isNetworkEnabledForSmartAccounts
+    ) {
+      if (!caipNetwork) {
+        return null
+      }
+
+      return html`<wui-compatible-network
+        @click=${this.onReceiveClick.bind(this)}
+        text="Only receive assets on this network"
+        .networkImages=${[AssetUtil.getNetworkImage(caipNetwork) ?? '']}
+      ></wui-compatible-network>`
+    }
     const slicedNetworks = networks?.filter(network => network?.imageId)?.slice(0, 5)
     const imagesArray = slicedNetworks.map(AssetUtil.getNetworkImage).filter(Boolean) as string[]
 
diff --git a/packages/siwe/src/client.ts b/packages/siwe/src/client.ts
index 4fb664e662..572da86e42 100644
--- a/packages/siwe/src/client.ts
+++ b/packages/siwe/src/client.ts
@@ -13,8 +13,8 @@ import {
   RouterUtil
 } from '@web3modal/core'
 
+import { NetworkUtil } from '@web3modal/common'
 import { ConstantsUtil } from '../core/utils/ConstantsUtil.js'
-import { HelpersUtil } from '@web3modal/scaffold-utils'
 
 // -- Client -------------------------------------------------------------------- //
 export class Web3ModalSIWEClient {
@@ -86,7 +86,7 @@ export class Web3ModalSIWEClient {
     if (!address) {
       throw new Error('An address is required to create a SIWE message.')
     }
-    const chainId = HelpersUtil.caipNetworkIdToNumber(NetworkController.state.caipNetwork?.id)
+    const chainId = NetworkUtil.caipNetworkIdToNumber(NetworkController.state.caipNetwork?.id)
     if (!chainId) {
       throw new Error('A chainId is required to create a SIWE message.')
     }
diff --git a/packages/ui/src/assets/visual/google.ts b/packages/ui/src/assets/visual/google.ts
new file mode 100644
index 0000000000..1fda8ba305
--- /dev/null
+++ b/packages/ui/src/assets/visual/google.ts
@@ -0,0 +1,12 @@
+import { svg } from 'lit'
+export const googleSvg = svg`<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <rect width="64" height="64" rx="30" fill="#1DC956"/>
+  <rect x="0.5" y="0.5" width="63" height="63" rx="29.5" stroke="#141414" stroke-opacity="0.1"/>
+  <path d="M32.4053 19.8031C35.3901 19.8031 38.0431 20.8349 40.1619 22.8247L45.9656 17.0211C42.4465 13.7416 37.8773 11.7333 32.4053 11.7333C24.4829 11.7333 17.6475 16.2841 14.3127 22.9168L21.056 28.1493C22.6589 23.359 27.136 19.8031 32.4053 19.8031Z" fill="#1DC956" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+  <path d="M32.4053 52.2667C37.8773 52.2667 42.465 50.4611 45.8182 47.3658L39.2407 42.2623C37.4351 43.4783 35.1321 44.2153 32.4053 44.2153C27.136 44.2153 22.6589 40.6594 21.056 35.8691L14.3127 41.1016C17.6475 47.7159 24.4829 52.2667 32.4053 52.2667Z" fill="#2BEE6C"/>
+  <path d="M21.056 35.8507L19.5636 36.993L14.3127 41.0832M39.2407 42.2623L45.8182 47.3658C42.465 50.4611 37.8773 52.2667 32.4053 52.2667C24.4829 52.2667 17.6475 47.7159 14.3127 41.1016L21.056 35.8691C22.6589 40.6594 27.136 44.2153 32.4053 44.2153C35.1321 44.2153 37.4351 43.4783 39.2407 42.2623Z" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+  <path d="M51.8613 32.4606C51.8613 31.0235 51.7323 29.6417 51.4928 28.3151H32.4053V36.1638H43.3124C42.8334 38.688 41.3963 40.8252 39.2407 42.2623L45.8181 47.3658C49.6503 43.8283 51.8613 38.6327 51.8613 32.4606Z" fill="#1FAD7E" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+  <path d="M21.056 35.8507C20.6507 34.6347 20.4111 33.345 20.4111 32C20.4111 30.655 20.6507 29.3653 21.056 28.1493L14.3127 22.9169C12.9309 25.6437 12.1387 28.7205 12.1387 32C12.1387 35.2795 12.9309 38.3564 14.3127 41.0831L19.5636 36.993L21.056 35.8507Z" fill="#86F999"/>
+  <path d="M21.056 35.8691L14.3127 41.1016M21.056 35.8507C20.6507 34.6347 20.4111 33.345 20.4111 32C20.4111 30.655 20.6507 29.3653 21.056 28.1493L14.3127 22.9169C12.9309 25.6437 12.1387 28.7205 12.1387 32C12.1387 35.2795 12.9309 38.3564 14.3127 41.0831L19.5636 36.993L21.056 35.8507Z" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+</svg>
+`
diff --git a/packages/ui/src/assets/visual/lightbulb.ts b/packages/ui/src/assets/visual/lightbulb.ts
new file mode 100644
index 0000000000..095f976e0b
--- /dev/null
+++ b/packages/ui/src/assets/visual/lightbulb.ts
@@ -0,0 +1,19 @@
+import { svg } from 'lit'
+export const lightbulbSvg = svg`<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <g clip-path="url(#clip0_241_31636)">
+    <path d="M0 26.5595C0 16.6913 0 11.7572 2.1019 8.07217C3.5216 5.58318 5.58366 3.52111 8.07266 2.10141C11.7577 -0.000488281 16.6918 -0.000488281 26.56 -0.000488281H37.44C47.3082 -0.000488281 52.2423 -0.000488281 55.9273 2.10141C58.4163 3.52111 60.4784 5.58318 61.8981 8.07217C64 11.7572 64 16.6913 64 26.5595V37.4395C64 47.3077 64 52.2418 61.8981 55.9269C60.4784 58.4159 58.4163 60.4779 55.9273 61.8976C52.2423 63.9995 47.3082 63.9995 37.44 63.9995H26.56C16.6918 63.9995 11.7577 63.9995 8.07266 61.8976C5.58366 60.4779 3.5216 58.4159 2.1019 55.9269C0 52.2418 0 47.3077 0 37.4395V26.5595Z" fill="#794CFF"/>
+    <path d="M0.5 26.5595C0.5 21.6163 0.50047 17.942 0.760736 15.0418C1.02039 12.1485 1.53555 10.0742 2.53621 8.3199C3.91155 5.90869 5.90917 3.91106 8.32039 2.53572C10.0747 1.53506 12.1489 1.01991 15.0423 0.760247C17.9425 0.499981 21.6168 0.499512 26.56 0.499512H37.44C42.3832 0.499512 46.0575 0.499981 48.9577 0.760247C51.8511 1.01991 53.9253 1.53506 55.6796 2.53572C58.0908 3.91106 60.0885 5.90869 61.4638 8.3199C62.4645 10.0742 62.9796 12.1485 63.2393 15.0418C63.4995 17.942 63.5 21.6163 63.5 26.5595V37.4395C63.5 42.3827 63.4995 46.057 63.2393 48.9572C62.9796 51.8506 62.4645 53.9248 61.4638 55.6791C60.0885 58.0903 58.0908 60.088 55.6796 61.4633C53.9253 62.464 51.8511 62.9791 48.9577 63.2388C46.0575 63.499 42.3832 63.4995 37.44 63.4995H26.56C21.6168 63.4995 17.9425 63.499 15.0423 63.2388C12.1489 62.9791 10.0747 62.464 8.32039 61.4633C5.90917 60.088 3.91155 58.0903 2.53621 55.6791C1.53555 53.9248 1.02039 51.8506 0.760736 48.9572C0.50047 46.057 0.5 42.3827 0.5 37.4395V26.5595Z" stroke="#141414" stroke-opacity="0.1"/>
+    <path d="M40 39.4595C44.7824 36.693 48 31.5222 48 25.6C48 16.7634 40.8366 9.59998 32 9.59998C23.1634 9.59998 16 16.7634 16 25.6C16 31.5222 19.2176 36.693 24 39.4595V45.8144H40V39.4595Z" fill="#906EF7"/>
+    <path d="M24 49.9689C24 51.8192 24 52.7444 24.3941 53.4353C24.6603 53.902 25.0469 54.2886 25.5136 54.5548C26.2046 54.9489 27.1297 54.9489 28.98 54.9489H35.02C36.8703 54.9489 37.7954 54.9489 38.4864 54.5548C38.9531 54.2886 39.3397 53.902 39.6059 53.4353C40 52.7444 40 51.8192 40 49.9689V45.8144H24V49.9689Z" fill="#906EF7"/>
+    <path d="M24 45.8144V39.4595C19.2176 36.693 16 31.5222 16 25.6C16 16.7634 23.1634 9.59998 32 9.59998C40.8366 9.59998 48 16.7634 48 25.6C48 31.5222 44.7824 36.693 40 39.4595V45.8144M24 45.8144H40M24 45.8144V49.9689C24 51.8192 24 52.7444 24.3941 53.4353C24.6603 53.902 25.0469 54.2886 25.5136 54.5548C26.2046 54.9489 27.1297 54.9489 28.98 54.9489H35.02C36.8703 54.9489 37.7954 54.9489 38.4864 54.5548C38.9531 54.2886 39.3397 53.902 39.6059 53.4353C40 52.7444 40 51.8192 40 49.9689V45.8144" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+    <path d="M24 49.9689C24 51.8192 24 52.7444 24.3941 53.4353C24.6603 53.902 25.0469 54.2886 25.5136 54.5548C26.2046 54.9489 27.1297 54.9489 28.98 54.9489H35.02C36.8703 54.9489 37.7954 54.9489 38.4864 54.5548C38.9531 54.2886 39.3397 53.902 39.6059 53.4353C40 52.7444 40 51.8192 40 49.9689V45.8144H24V49.9689Z" fill="#643CDD" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+    <path d="M29.6735 26.9101V29.1109H34.0753V26.9101C34.0753 25.6945 35.0607 24.7092 36.2762 24.7092C37.4917 24.7092 38.4771 25.6945 38.4771 26.9101C38.4771 28.1256 37.4917 29.1109 36.2762 29.1109H34.0753H29.6735H27.4726C26.2571 29.1109 25.2717 28.1256 25.2717 26.9101C25.2717 25.6945 26.2571 24.7092 27.4726 24.7092C28.6881 24.7092 29.6735 25.6945 29.6735 26.9101Z" fill="#906EF7"/>
+    <path d="M29.6735 45.3183V26.9101C29.6735 25.6945 28.6881 24.7092 27.4726 24.7092V24.7092C26.2571 24.7092 25.2717 25.6945 25.2717 26.9101V26.9101C25.2717 28.1256 26.2571 29.1109 27.4726 29.1109H36.2762C37.4917 29.1109 38.4771 28.1256 38.4771 26.9101V26.9101C38.4771 25.6945 37.4917 24.7092 36.2762 24.7092V24.7092C35.0607 24.7092 34.0753 25.6945 34.0753 26.9101V45.3183" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+  </g>
+  <defs>
+    <clipPath id="clip0_241_31636">
+      <rect width="64" height="64" fill="white"/>
+    </clipPath>
+  </defs>
+</svg>
+`
diff --git a/packages/ui/src/assets/visual/pencil.ts b/packages/ui/src/assets/visual/pencil.ts
new file mode 100644
index 0000000000..93f04262c1
--- /dev/null
+++ b/packages/ui/src/assets/visual/pencil.ts
@@ -0,0 +1,21 @@
+import { svg } from 'lit'
+export const pencilSvg = svg`<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <g clip-path="url(#clip0_241_31635)">
+    <path d="M0 26.5595C0 16.6913 0 11.7572 2.1019 8.07217C3.5216 5.58317 5.58366 3.52111 8.07266 2.10141C11.7577 -0.000488281 16.6918 -0.000488281 26.56 -0.000488281H37.44C47.3082 -0.000488281 52.2423 -0.000488281 55.9273 2.10141C58.4163 3.52111 60.4784 5.58317 61.8981 8.07217C64 11.7572 64 16.6913 64 26.5595V37.4395C64 47.3077 64 52.2418 61.8981 55.9268C60.4784 58.4158 58.4163 60.4779 55.9273 61.8976C52.2423 63.9995 47.3082 63.9995 37.44 63.9995H26.56C16.6918 63.9995 11.7577 63.9995 8.07266 61.8976C5.58366 60.4779 3.5216 58.4158 2.1019 55.9268C0 52.2418 0 47.3077 0 37.4395V26.5595Z" fill="#EB8B47"/>
+    <path d="M0.5 26.5595C0.5 21.6163 0.50047 17.942 0.760736 15.0418C1.02039 12.1485 1.53555 10.0742 2.53621 8.3199C3.91155 5.90869 5.90917 3.91106 8.32039 2.53572C10.0747 1.53506 12.1489 1.01991 15.0423 0.760247C17.9425 0.499981 21.6168 0.499512 26.56 0.499512H37.44C42.3832 0.499512 46.0575 0.499981 48.9577 0.760247C51.8511 1.01991 53.9253 1.53506 55.6796 2.53572C58.0908 3.91106 60.0885 5.90869 61.4638 8.3199C62.4645 10.0742 62.9796 12.1485 63.2393 15.0418C63.4995 17.942 63.5 21.6163 63.5 26.5595V37.4395C63.5 42.3827 63.4995 46.057 63.2393 48.9572C62.9796 51.8506 62.4645 53.9248 61.4638 55.6791C60.0885 58.0903 58.0908 60.088 55.6796 61.4633C53.9253 62.464 51.8511 62.9791 48.9577 63.2388C46.0575 63.499 42.3832 63.4995 37.44 63.4995H26.56C21.6168 63.4995 17.9425 63.499 15.0423 63.2388C12.1489 62.9791 10.0747 62.464 8.32039 61.4633C5.90917 60.088 3.91155 58.0903 2.53621 55.6791C1.53555 53.9248 1.02039 51.8506 0.760736 48.9572C0.50047 46.057 0.5 42.3827 0.5 37.4395V26.5595Z" stroke="#141414" stroke-opacity="0.1"/>
+    <path d="M28.1042 49.2329L13.1024 51.2077L15.0772 36.2059L37.1015 14.1815C39.2441 12.039 40.3154 10.9677 41.5718 10.624C42.4205 10.3918 43.3159 10.3918 44.1645 10.624C45.421 10.9677 46.4922 12.039 48.6348 14.1815L50.1286 15.6753C52.2711 17.8179 53.3424 18.8891 53.6861 20.1456C53.9183 20.9942 53.9183 21.8896 53.6861 22.7383C53.3424 23.9947 52.2711 25.066 50.1286 27.2086L28.1042 49.2329Z" fill="#FF974C" stroke="#E4E7E7" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M38.5962 20.5376L22.4199 36.7139" stroke="#E4E7E7" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M43.7727 25.714L27.5964 41.8903" stroke="#E4E7E7" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M22.3703 36.7635C19.3258 39.808 16.0198 36.6395 16.2616 35.0324" stroke="#E4E7E7" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M27.5466 41.9399C24.5034 44.9831 28.155 48.7098 29.2738 48.0475" stroke="#E4E7E7" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M27.5468 41.9398C23.428 46.0586 18.2516 40.8822 22.3704 36.7634" stroke="#E4E7E7" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M15.8191 50.5214C15.4711 49.5823 14.728 48.8392 13.7889 48.4912" stroke="#E4E7E7" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+    <path d="M49.2862 29.5805L34.7275 15.0219" stroke="#E4E7E7" stroke-width="2" stroke-linejoin="round"/>
+  </g>
+  <defs>
+    <clipPath id="clip0_241_31635">
+      <rect width="64" height="64" fill="white"/>
+    </clipPath>
+  </defs>
+</svg>
+`
diff --git a/packages/ui/src/components/wui-text/styles.ts b/packages/ui/src/components/wui-text/styles.ts
index 7a65f524f7..51e425d799 100644
--- a/packages/ui/src/components/wui-text/styles.ts
+++ b/packages/ui/src/components/wui-text/styles.ts
@@ -58,6 +58,7 @@ export default css`
     letter-spacing: var(--wui-letter-spacing-2xl);
   }
 
+  .wui-font-paragraph-400,
   .wui-font-paragraph-500,
   .wui-font-paragraph-600,
   .wui-font-paragraph-700 {
diff --git a/packages/ui/src/components/wui-visual/index.ts b/packages/ui/src/components/wui-visual/index.ts
index 3cccfe16e7..c1135db139 100644
--- a/packages/ui/src/components/wui-visual/index.ts
+++ b/packages/ui/src/components/wui-visual/index.ts
@@ -22,6 +22,9 @@ import { moonpaySvg } from '../../assets/visual/moonpay.js'
 import { stripeSvg } from '../../assets/visual/stripe.js'
 import { paypalSvg } from '../../assets/visual/paypal.js'
 import { onrampCardSvg } from '../../assets/visual/onramp-card.js'
+import { googleSvg } from '../../assets/visual/google.js'
+import { pencilSvg } from '../../assets/visual/pencil.js'
+import { lightbulbSvg } from '../../assets/visual/lightbulb.js'
 import styles from './styles.js'
 
 // -- Svg's-------------------------------- //
@@ -43,7 +46,10 @@ const svgOptions: Record<VisualType, TemplateResult<2>> = {
   onrampCard: onrampCardSvg,
   moonpay: moonpaySvg,
   stripe: stripeSvg,
-  paypal: paypalSvg
+  paypal: paypalSvg,
+  google: googleSvg,
+  pencil: pencilSvg,
+  lightbulb: lightbulbSvg
 }
 
 @customElement('wui-visual')
diff --git a/packages/ui/src/composites/wui-profile-button/index.ts b/packages/ui/src/composites/wui-profile-button/index.ts
index 9e0a57b085..a30bb355ef 100644
--- a/packages/ui/src/composites/wui-profile-button/index.ts
+++ b/packages/ui/src/composites/wui-profile-button/index.ts
@@ -29,7 +29,7 @@ export class WuiProfileButton extends LitElement {
 
   // -- Render -------------------------------------------- //
   public override render() {
-    return html` <button ontouchstart>
+    return html`<button ontouchstart data-testid="wui-profile-button">
       <wui-flex gap="xs" alignItems="center">
         <wui-avatar
           .imageSrc=${this.avatarSrc}
diff --git a/packages/ui/src/utils/TypeUtil.ts b/packages/ui/src/utils/TypeUtil.ts
index dfb5ddae69..67635919ce 100644
--- a/packages/ui/src/utils/TypeUtil.ts
+++ b/packages/ui/src/utils/TypeUtil.ts
@@ -165,7 +165,9 @@ export type VisualType =
   | 'defi'
   | 'defiAlt'
   | 'eth'
+  | 'google'
   | 'layers'
+  | 'lightbulb'
   | 'lock'
   | 'login'
   | 'network'
@@ -177,6 +179,7 @@ export type VisualType =
   | 'moonpay'
   | 'stripe'
   | 'paypal'
+  | 'pencil'
 
 export type VisualSize = 'sm' | 'md' | 'lg'
 
diff --git a/packages/wagmi/src/client.ts b/packages/wagmi/src/client.ts
index dd5a3ef1ec..e69453a7ed 100644
--- a/packages/wagmi/src/client.ts
+++ b/packages/wagmi/src/client.ts
@@ -6,7 +6,6 @@ import {
   getBalance,
   getEnsAvatar,
   getEnsName,
-  getAccount,
   switchChain,
   watchAccount,
   watchConnectors
@@ -36,7 +35,7 @@ import {
 } from './utils/helpers.js'
 import { W3mFrameHelpers, W3mFrameRpcConstants } from '@web3modal/wallet'
 import type { W3mFrameProvider } from '@web3modal/wallet'
-import { ConstantsUtil as CoreConstants } from '@web3modal/core'
+import { NetworkUtil } from '@web3modal/common'
 import type { defaultWagmiConfig as coreConfig } from './utils/defaultWagmiCoreConfig.js'
 import type { defaultWagmiConfig as reactConfig } from './utils/defaultWagmiReactConfig.js'
 
@@ -83,7 +82,7 @@ export class Web3Modal extends Web3ModalScaffold {
 
     const networkControllerClient: NetworkControllerClient = {
       switchCaipNetwork: async caipNetwork => {
-        const chainId = HelpersUtil.caipNetworkIdToNumber(caipNetwork?.id)
+        const chainId = NetworkUtil.caipNetworkIdToNumber(caipNetwork?.id)
 
         if (chainId) {
           await switchChain(this.wagmiConfig, { chainId })
@@ -125,7 +124,7 @@ export class Web3Modal extends Web3ModalScaffold {
           onUri(data)
         })
 
-        const chainId = HelpersUtil.caipNetworkIdToNumber(this.getCaipNetwork()?.id)
+        const chainId = NetworkUtil.caipNetworkIdToNumber(this.getCaipNetwork()?.id)
 
         await connect(this.wagmiConfig, { connector, chainId })
       },
@@ -139,7 +138,7 @@ export class Web3Modal extends Web3ModalScaffold {
           // @ts-expect-error Exists on EIP6963Connector
           connector.setEip6963Wallet?.({ provider, info })
         }
-        const chainId = HelpersUtil.caipNetworkIdToNumber(this.getCaipNetwork()?.id)
+        const chainId = NetworkUtil.caipNetworkIdToNumber(this.getCaipNetwork()?.id)
 
         await connect(this.wagmiConfig, { connector, chainId })
       },
@@ -204,7 +203,7 @@ export class Web3Modal extends Web3ModalScaffold {
 
     return {
       ...state,
-      selectedNetworkId: HelpersUtil.caipNetworkIdToNumber(state.selectedNetworkId)
+      selectedNetworkId: NetworkUtil.caipNetworkIdToNumber(state.selectedNetworkId)
     }
   }
 
@@ -213,7 +212,7 @@ export class Web3Modal extends Web3ModalScaffold {
     return super.subscribeState(state =>
       callback({
         ...state,
-        selectedNetworkId: HelpersUtil.caipNetworkIdToNumber(state.selectedNetworkId)
+        selectedNetworkId: NetworkUtil.caipNetworkIdToNumber(state.selectedNetworkId)
       })
     )
   }
@@ -232,11 +231,14 @@ export class Web3Modal extends Web3ModalScaffold {
     this.setRequestedCaipNetworks(requestedCaipNetworks ?? [])
   }
 
-  private async syncAccount({ address, isConnected, chainId, connector }: GetAccountReturnType) {
+  private async syncAccount({
+    address,
+    isConnected,
+    chainId,
+    connector
+  }: Pick<GetAccountReturnType, 'address' | 'isConnected' | 'chainId' | 'connector'>) {
     this.resetAccount()
-
-    // TOD0: Check with Sven. Now network is synced when acc is synced.
-    this.syncNetwork()
+    this.syncNetwork(address, chainId, isConnected)
     if (isConnected && address && chainId) {
       const caipAddress: CaipAddress = `${ConstantsUtil.EIP155}:${chainId}:${address}`
       this.setIsConnected(isConnected)
@@ -255,8 +257,7 @@ export class Web3Modal extends Web3ModalScaffold {
     }
   }
 
-  private async syncNetwork() {
-    const { address, isConnected, chainId } = getAccount(this.wagmiConfig)
+  private async syncNetwork(address?: Hex, chainId?: number, isConnected?: boolean) {
     const chain = this.wagmiConfig.chains.find((c: Chain) => c.id === chainId)
 
     if (chain || chainId) {
@@ -366,7 +367,7 @@ export class Web3Modal extends Web3ModalScaffold {
 
     // Check if coinbase injected connector is present
     const coinbaseConnector = filteredConnectors.find(
-      c => c.id === CoreConstants.CONNECTOR_RDNS_MAP[ConstantsUtil.COINBASE_CONNECTOR_ID]
+      c => c.id === ConstantsUtil.CONNECTOR_RDNS_MAP[ConstantsUtil.COINBASE_CONNECTOR_ID]
     )
 
     filteredConnectors.forEach(({ id, name, type, icon }) => {
@@ -422,10 +423,6 @@ export class Web3Modal extends Web3ModalScaffold {
         this.setIsConnected(false)
       }
 
-      provider.onInitSmartAccount((isDeployed: boolean) => {
-        this.setSmartAccountDeployed(isDeployed)
-      })
-
       provider.onRpcRequest(request => {
         if (W3mFrameHelpers.checkIfRequestExists(request)) {
           if (!W3mFrameHelpers.checkIfRequestIsAllowed(request)) {
@@ -452,10 +449,28 @@ export class Web3Modal extends Web3ModalScaffold {
         super.setLoading(false)
       })
 
-      provider.onIsConnected(() => {
+      provider.onIsConnected(req => {
         this.setIsConnected(true)
+        this.setSmartAccountDeployed(Boolean(req.smartAccountDeployed))
         super.setLoading(false)
       })
+
+      provider.onGetSmartAccountEnabledNetworks(networks => {
+        this.setSmartAccountEnabledNetworks(networks)
+      })
+
+      provider.onSetPreferredAccount(({ address }) => {
+        if (!address) {
+          return
+        }
+        const chainId = NetworkUtil.caipNetworkIdToNumber(this.getCaipNetwork()?.id)
+        this.syncAccount({
+          address: address as `0x${string}`,
+          chainId,
+          isConnected: true,
+          connector
+        })
+      })
     }
   }
 
diff --git a/packages/wagmi/src/connectors/EmailConnector.ts b/packages/wagmi/src/connectors/EmailConnector.ts
index caedde41ee..2e2fc94420 100644
--- a/packages/wagmi/src/connectors/EmailConnector.ts
+++ b/packages/wagmi/src/connectors/EmailConnector.ts
@@ -1,5 +1,5 @@
 import { createConnector, normalizeChainId, type CreateConfigParameters } from '@wagmi/core'
-import { W3mFrameProvider } from '@web3modal/wallet'
+import { W3mFrameHelpers, W3mFrameProvider } from '@web3modal/wallet'
 import { SwitchChainError, getAddress } from 'viem'
 import type { Address } from 'viem'
 
@@ -8,7 +8,6 @@ import { ConstantsUtil } from '@web3modal/scaffold-utils'
 // -- Types ----------------------------------------------------------------------------------------
 interface W3mFrameProviderOptions {
   projectId: string
-  enableSmartAccounts?: boolean
 }
 
 interface ConnectOptions {
@@ -24,7 +23,6 @@ export type EmailParameters = {
 export function emailConnector(parameters: EmailParameters) {
   type Properties = {
     provider?: W3mFrameProvider
-    initSmartAccount: () => Promise<{ isDeployed: boolean; address?: Address }>
   }
 
   return createConnector<W3mFrameProvider, Properties>(config => ({
@@ -34,19 +32,14 @@ export function emailConnector(parameters: EmailParameters) {
 
     async connect(options: ConnectOptions = {}) {
       const provider = await this.getProvider()
-      const { address, chainId } = await provider.connect({ chainId: options.chainId })
-      const { isDeployed, address: smartAccountAddress } = await this.initSmartAccount()
-      if (isDeployed && smartAccountAddress) {
-        return {
-          accounts: [smartAccountAddress],
-          account: smartAccountAddress,
-          chainId,
-          chain: {
-            id: chainId,
-            unsuported: false
-          }
-        }
-      }
+      const preferredAccountType = W3mFrameHelpers.getPreferredAccountType()
+      const [{ address, chainId }] = await Promise.all([
+        provider.connect({
+          chainId: options.chainId,
+          preferredAccountType
+        }),
+        provider.getSmartAccountEnabledNetworks()
+      ])
 
       return {
         accounts: [address as Address],
@@ -59,20 +52,6 @@ export function emailConnector(parameters: EmailParameters) {
       }
     },
 
-    async initSmartAccount() {
-      if (!parameters.options.enableSmartAccounts) {
-        return { isDeployed: false }
-      }
-      const provider = await this.getProvider()
-      const chainId = await this.getChainId()
-      const { smartAccountEnabledNetworks } = await provider.getSmartAccountEnabledNetworks()
-      if (smartAccountEnabledNetworks.includes(chainId)) {
-        return (await provider.initSmartAccount()) as { isDeployed: boolean; address?: Address }
-      }
-
-      return { isDeployed: false }
-    },
-
     async disconnect() {
       const provider = await this.getProvider()
       await provider.disconnect()
@@ -80,7 +59,9 @@ export function emailConnector(parameters: EmailParameters) {
 
     async getAccounts() {
       const provider = await this.getProvider()
-      const { address } = await provider.connect()
+      const preferredAccountType = W3mFrameHelpers.getPreferredAccountType()
+      const { address } = await provider.connect({ preferredAccountType })
+      config.emitter.emit('change', { accounts: [address as Address] })
 
       return [address as Address]
     },
diff --git a/packages/wagmi/src/utils/defaultWagmiCoreConfig.ts b/packages/wagmi/src/utils/defaultWagmiCoreConfig.ts
index a0d5331df3..19e6d22a4e 100644
--- a/packages/wagmi/src/utils/defaultWagmiCoreConfig.ts
+++ b/packages/wagmi/src/utils/defaultWagmiCoreConfig.ts
@@ -15,7 +15,6 @@ export type ConfigOptions = Partial<CreateConfigParameters> & {
   enableCoinbase?: boolean
   enableEmail?: boolean
   enableWalletConnect?: boolean
-  enableSmartAccounts?: boolean
   metadata: {
     name: string
     description: string
@@ -33,7 +32,6 @@ export function defaultWagmiConfig({
   enableEmail,
   enableWalletConnect,
   enableEIP6963,
-  enableSmartAccounts,
   ...wagmiConfig
 }: ConfigOptions) {
   const connectors: CreateConnectorFn[] = []
@@ -64,9 +62,7 @@ export function defaultWagmiConfig({
 
   // Dissabled by default
   if (enableEmail === true) {
-    connectors.push(
-      emailConnector({ chains: [...chains], options: { projectId, enableSmartAccounts } })
-    )
+    connectors.push(emailConnector({ chains: [...chains], options: { projectId } }))
   }
 
   return createConfig({
diff --git a/packages/wagmi/src/utils/defaultWagmiReactConfig.ts b/packages/wagmi/src/utils/defaultWagmiReactConfig.ts
index 7cbdf95ac9..6e76ea9bc3 100644
--- a/packages/wagmi/src/utils/defaultWagmiReactConfig.ts
+++ b/packages/wagmi/src/utils/defaultWagmiReactConfig.ts
@@ -15,7 +15,6 @@ export type ConfigOptions = Partial<CreateConfigParameters> & {
   enableCoinbase?: boolean
   enableEmail?: boolean
   enableWalletConnect?: boolean
-  enableSmartAccounts?: boolean
   metadata: {
     name: string
     description: string
@@ -33,7 +32,6 @@ export function defaultWagmiConfig({
   enableEmail,
   enableWalletConnect,
   enableEIP6963,
-  enableSmartAccounts,
   ...wagmiConfig
 }: ConfigOptions): Config {
   const connectors: CreateConnectorFn[] = []
@@ -64,9 +62,7 @@ export function defaultWagmiConfig({
 
   // Dissabled by default
   if (enableEmail === true) {
-    connectors.push(
-      emailConnector({ chains: [...chains], options: { projectId, enableSmartAccounts } })
-    )
+    connectors.push(emailConnector({ chains: [...chains], options: { projectId } }))
   }
 
   return createConfig({
diff --git a/packages/wallet/src/W3mFrameConstants.ts b/packages/wallet/src/W3mFrameConstants.ts
index bb0af11393..e4e626cb91 100644
--- a/packages/wallet/src/W3mFrameConstants.ts
+++ b/packages/wallet/src/W3mFrameConstants.ts
@@ -12,6 +12,8 @@ export const W3mFrameConstants = {
   LAST_EMAIL_LOGIN_TIME: 'LAST_EMAIL_LOGIN_TIME',
   EMAIL: 'EMAIL',
   PREFERRED_ACCOUNT_TYPE: 'PREFERRED_ACCOUNT_TYPE',
+  SMART_ACCOUNT_ENABLED: 'SMART_ACCOUNT_ENABLED',
+  SMART_ACCOUNT_ENABLED_NETWORKS: 'SMART_ACCOUNT_ENABLED_NETWORKS',
 
   APP_SWITCH_NETWORK: '@w3m-app/SWITCH_NETWORK',
   APP_CONNECT_EMAIL: '@w3m-app/CONNECT_EMAIL',
@@ -111,5 +113,9 @@ export const W3mFrameRpcConstants = {
   NOT_SAFE_RPC_METHODS: ['personal_sign', 'eth_signTypedData_v4', 'eth_sendTransaction'],
   GET_CHAIN_ID: 'eth_chainId',
   RPC_METHOD_NOT_ALLOWED_MESSAGE: 'Requested RPC call is not allowed',
-  RPC_METHOD_NOT_ALLOWED_UI_MESSAGE: 'Action not allowed'
+  RPC_METHOD_NOT_ALLOWED_UI_MESSAGE: 'Action not allowed',
+  ACCOUNT_TYPES: {
+    EOA: 'eoa',
+    SMART_ACCOUNT: 'smartAccount'
+  } as const
 }
diff --git a/packages/wallet/src/W3mFrameHelpers.ts b/packages/wallet/src/W3mFrameHelpers.ts
index 845113d99c..afcf3835d0 100644
--- a/packages/wallet/src/W3mFrameHelpers.ts
+++ b/packages/wallet/src/W3mFrameHelpers.ts
@@ -73,5 +73,13 @@ export const W3mFrameHelpers = {
     return W3mFrameRpcConstants.SAFE_RPC_METHODS.includes(method)
   },
 
+  getPreferredAccountType(): W3mFrameTypes.AccountType {
+    const storedType = W3mFrameStorage.get(
+      W3mFrameConstants.PREFERRED_ACCOUNT_TYPE
+    ) as W3mFrameTypes.AccountType
+
+    return storedType || W3mFrameRpcConstants.ACCOUNT_TYPES.EOA
+  },
+
   isClient: typeof window !== 'undefined'
 }
diff --git a/packages/wallet/src/W3mFrameProvider.ts b/packages/wallet/src/W3mFrameProvider.ts
index 7766dc9639..1736274217 100644
--- a/packages/wallet/src/W3mFrameProvider.ts
+++ b/packages/wallet/src/W3mFrameProvider.ts
@@ -25,7 +25,6 @@ type SyncDappDataResolver = Resolver<undefined>
 type SmartAccountEnabledNetworksResolver = Resolver<
   W3mFrameTypes.Responses['FrameGetSmartAccountEnabledNetworksResponse']
 >
-type InitSmartAccountResolver = Resolver<W3mFrameTypes.Responses['FrameInitSmartAccountResponse']>
 type SetPreferredAccountResolver = Resolver<undefined>
 
 // -- Provider --------------------------------------------------------
@@ -62,8 +61,6 @@ export class W3mFrameProvider {
 
   private smartAccountEnabledNetworksResolver: SmartAccountEnabledNetworksResolver = undefined
 
-  private initSmartAccountResolver: InitSmartAccountResolver = undefined
-
   private setPreferredAccountResolver: SetPreferredAccountResolver = undefined
 
   public constructor(projectId: string) {
@@ -135,10 +132,6 @@ export class W3mFrameProvider {
           return this.onSmartAccountEnabledNetworksSuccess(event)
         case W3mFrameConstants.FRAME_GET_SMART_ACCOUNT_ENABLED_NETWORKS_ERROR:
           return this.onSmartAccountEnabledNetworksError(event)
-        case W3mFrameConstants.FRAME_INIT_SMART_ACCOUNT_SUCCESS:
-          return this.onInitSmartAccountSuccess(event)
-        case W3mFrameConstants.FRAME_INIT_SMART_ACCOUNT_ERROR:
-          return this.onInitSmartAccountError(event)
         case W3mFrameConstants.FRAME_SET_PREFERRED_ACCOUNT_SUCCESS:
           return this.onPreferSmartAccountSuccess(event)
         case W3mFrameConstants.FRAME_SET_PREFERRED_ACCOUNT_ERROR:
@@ -283,18 +276,7 @@ export class W3mFrameProvider {
     )
   }
 
-  public async initSmartAccount() {
-    await this.w3mFrame.frameLoadPromise
-    this.w3mFrame.events.postAppEvent({ type: W3mFrameConstants.APP_INIT_SMART_ACCOUNT })
-
-    return new Promise<W3mFrameTypes.Responses['FrameInitSmartAccountResponse']>(
-      (resolve, reject) => {
-        this.initSmartAccountResolver = { resolve, reject }
-      }
-    )
-  }
-
-  public async setPreferredAccount(type: 'eoa' | 'smartAccount') {
+  public async setPreferredAccount(type: W3mFrameTypes.AccountType) {
     await this.w3mFrame.frameLoadPromise
     this.w3mFrame.events.postAppEvent({
       type: W3mFrameConstants.APP_SET_PREFERRED_ACCOUNT,
@@ -312,7 +294,7 @@ export class W3mFrameProvider {
     await this.w3mFrame.frameLoadPromise
     this.w3mFrame.events.postAppEvent({
       type: W3mFrameConstants.APP_GET_USER,
-      payload: { chainId }
+      payload: { chainId, preferredAccountType: payload?.preferredAccountType }
     })
 
     return new Promise<W3mFrameTypes.Responses['FrameGetUserResponse']>((resolve, reject) => {
@@ -374,10 +356,12 @@ export class W3mFrameProvider {
     })
   }
 
-  public onIsConnected(callback: () => void) {
+  public onIsConnected(
+    callback: (request: W3mFrameTypes.Responses['FrameGetUserResponse']) => void
+  ) {
     this.w3mFrame.events.onFrameEvent(event => {
       if (event.type === W3mFrameConstants.FRAME_GET_USER_SUCCESS) {
-        callback()
+        callback(event.payload)
       }
     })
   }
@@ -396,12 +380,24 @@ export class W3mFrameProvider {
     })
   }
 
-  public onInitSmartAccount(callback: (isDeployed: boolean) => void) {
+  public onSetPreferredAccount(
+    callback: ({ type, address }: { type: string; address?: string }) => void
+  ) {
     this.w3mFrame.events.onFrameEvent(event => {
-      if (event.type === W3mFrameConstants.FRAME_INIT_SMART_ACCOUNT_SUCCESS) {
-        callback(event.payload.isDeployed)
-      } else if (event.type === W3mFrameConstants.FRAME_INIT_SMART_ACCOUNT_ERROR) {
-        callback(false)
+      if (event.type === W3mFrameConstants.FRAME_SET_PREFERRED_ACCOUNT_SUCCESS) {
+        callback(event.payload)
+      } else if (event.type === W3mFrameConstants.FRAME_SET_PREFERRED_ACCOUNT_ERROR) {
+        callback({ type: W3mFrameRpcConstants.ACCOUNT_TYPES.EOA })
+      }
+    })
+  }
+
+  public onGetSmartAccountEnabledNetworks(callback: (networks: number[]) => void) {
+    this.w3mFrame.events.onFrameEvent(event => {
+      if (event.type === W3mFrameConstants.FRAME_GET_SMART_ACCOUNT_ENABLED_NETWORKS_SUCCESS) {
+        callback(event.payload.smartAccountEnabledNetworks)
+      } else if (event.type === W3mFrameConstants.FRAME_GET_SMART_ACCOUNT_ENABLED_NETWORKS_ERROR) {
+        callback([])
       }
     })
   }
@@ -594,6 +590,7 @@ export class W3mFrameProvider {
       { type: '@w3m-frame/GET_SMART_ACCOUNT_ENABLED_NETWORKS_SUCCESS' }
     >
   ) {
+    this.persistSmartAccountEnabledNetworks(event.payload.smartAccountEnabledNetworks)
     this.smartAccountEnabledNetworksResolver?.resolve(event.payload)
   }
 
@@ -603,25 +600,14 @@ export class W3mFrameProvider {
       { type: '@w3m-frame/GET_SMART_ACCOUNT_ENABLED_NETWORKS_ERROR' }
     >
   ) {
+    this.persistSmartAccountEnabledNetworks([])
     this.smartAccountEnabledNetworksResolver?.reject(event.payload.message)
   }
 
-  private onInitSmartAccountSuccess(
-    event: Extract<W3mFrameTypes.FrameEvent, { type: '@w3m-frame/INIT_SMART_ACCOUNT_SUCCESS' }>
-  ) {
-    this.initSmartAccountResolver?.resolve(event.payload)
-  }
-
-  private onInitSmartAccountError(
-    event: Extract<W3mFrameTypes.FrameEvent, { type: '@w3m-frame/INIT_SMART_ACCOUNT_ERROR' }>
-  ) {
-    this.initSmartAccountResolver?.reject(event.payload.message)
-  }
-
   private onPreferSmartAccountSuccess(
     event: Extract<W3mFrameTypes.FrameEvent, { type: '@w3m-frame/SET_PREFERRED_ACCOUNT_SUCCESS' }>
   ) {
-    this.persistPreferredAccount(event.payload.type as 'eoa' | 'smartAccount')
+    this.persistPreferredAccount(event.payload.type as W3mFrameTypes.AccountType)
     this.setPreferredAccountResolver?.resolve(undefined)
   }
 
@@ -654,7 +640,11 @@ export class W3mFrameProvider {
     return Number(W3mFrameStorage.get(W3mFrameConstants.LAST_USED_CHAIN_KEY))
   }
 
-  private persistPreferredAccount(type: 'eoa' | 'smartAccount') {
+  private persistPreferredAccount(type: W3mFrameTypes.AccountType) {
     W3mFrameStorage.set(W3mFrameConstants.PREFERRED_ACCOUNT_TYPE, type)
   }
+
+  private persistSmartAccountEnabledNetworks(networks: number[]) {
+    W3mFrameStorage.set(W3mFrameConstants.SMART_ACCOUNT_ENABLED_NETWORKS, networks.join(','))
+  }
 }
diff --git a/packages/wallet/src/W3mFrameSchema.ts b/packages/wallet/src/W3mFrameSchema.ts
index 81902a7eb9..54c5443217 100644
--- a/packages/wallet/src/W3mFrameSchema.ts
+++ b/packages/wallet/src/W3mFrameSchema.ts
@@ -441,13 +441,6 @@ export const W3mFrameSchema = {
         payload: zError
       })
     )
-
-    .or(
-      z.object({
-        type: zType('FRAME_INIT_SMART_ACCOUNT_SUCCESS'),
-        payload: FrameInitSmartAccountResponse
-      })
-    )
     .or(z.object({ type: zType('FRAME_INIT_SMART_ACCOUNT_ERROR'), payload: zError }))
     .or(
       z.object({
diff --git a/packages/wallet/src/W3mFrameTypes.ts b/packages/wallet/src/W3mFrameTypes.ts
index c567ae60e0..d3483d68f1 100644
--- a/packages/wallet/src/W3mFrameTypes.ts
+++ b/packages/wallet/src/W3mFrameTypes.ts
@@ -55,9 +55,9 @@ import {
   RpcEthChainId,
   FrameSwitchNetworkResponse,
   AppSyncDappDataRequest,
-  FrameGetSmartAccountEnabledNetworksResponse,
-  FrameInitSmartAccountResponse
+  FrameGetSmartAccountEnabledNetworksResponse
 } from './W3mFrameSchema.js'
+import type { W3mFrameRpcConstants } from './W3mFrameConstants.js'
 
 export namespace W3mFrameTypes {
   export type AppEvent = z.infer<typeof W3mFrameSchema.appEvent>
@@ -86,7 +86,6 @@ export namespace W3mFrameTypes {
     FrameGetSmartAccountEnabledNetworksResponse: z.infer<
       typeof FrameGetSmartAccountEnabledNetworksResponse
     >
-    FrameInitSmartAccountResponse: z.infer<typeof FrameInitSmartAccountResponse>
   }
 
   export interface Network {
@@ -136,4 +135,6 @@ export namespace W3mFrameTypes {
   export type RPCResponse = z.infer<typeof RpcResponse>
 
   export type FrameSessionType = z.infer<typeof FrameSession>
+  export type AccountType =
+    (typeof W3mFrameRpcConstants.ACCOUNT_TYPES)[keyof typeof W3mFrameRpcConstants.ACCOUNT_TYPES]
 }