diff --git a/apps/web/src/components/MnemonicWord/MnemonicWord.tsx b/apps/web/src/components/MnemonicWord/MnemonicWord.tsx
new file mode 100644
index 0000000000..5909ed6986
--- /dev/null
+++ b/apps/web/src/components/MnemonicWord/MnemonicWord.tsx
@@ -0,0 +1,43 @@
+import { GridItem, type GridItemProps, Text } from "@chakra-ui/react";
+import { MnemonicAutocomplete } from "@umami/components";
+import { type ComponentProps } from "react";
+
+import { useColor } from "../../styles/useColor";
+
+type MnemonicWordProps = {
+  index: number;
+  word?: string;
+  autocompleteProps?: ComponentProps<typeof MnemonicAutocomplete>;
+} & GridItemProps;
+
+export const MnemonicWord = ({ index, word, autocompleteProps, ...props }: MnemonicWordProps) => {
+  const color = useColor();
+
+  return (
+    <GridItem {...props}>
+      <Text
+        position="absolute"
+        zIndex={1}
+        marginTop={{ lg: "11px", base: "8px" }}
+        marginLeft={{ lg: "16px", base: "10px" }}
+        color={color("300")}
+        textAlign="right"
+        size={{ lg: "lg", base: "xs" }}
+      >
+        {String(index + 1).padStart(2, "0")}.
+      </Text>
+      {autocompleteProps && <MnemonicAutocomplete {...autocompleteProps} />}
+      {word && (
+        <Text
+          alignSelf="center"
+          paddingRight="10px"
+          paddingLeft={{ base: "30px", lg: "48px" }}
+          fontSize={{ base: "xs", lg: "lg" }}
+          fontWeight="medium"
+        >
+          {word}
+        </Text>
+      )}
+    </GridItem>
+  );
+};
diff --git a/apps/web/src/components/MnemonicWord/index.ts b/apps/web/src/components/MnemonicWord/index.ts
new file mode 100644
index 0000000000..058f49c522
--- /dev/null
+++ b/apps/web/src/components/MnemonicWord/index.ts
@@ -0,0 +1 @@
+export { MnemonicWord } from "./MnemonicWord";
diff --git a/apps/web/src/components/Onboarding/ImportWallet/SeedPhraseTab.tsx b/apps/web/src/components/Onboarding/ImportWallet/SeedPhraseTab.tsx
index 690dff38c0..77783d5d04 100644
--- a/apps/web/src/components/Onboarding/ImportWallet/SeedPhraseTab.tsx
+++ b/apps/web/src/components/Onboarding/ImportWallet/SeedPhraseTab.tsx
@@ -7,12 +7,10 @@ import {
   Button,
   Flex,
   Grid,
-  GridItem,
   Heading,
   Icon,
-  Text,
 } from "@chakra-ui/react";
-import { MnemonicAutocomplete, useDynamicModalContext, useMultiForm } from "@umami/components";
+import { useDynamicModalContext, useMultiForm } from "@umami/components";
 import { useAsyncActionHandler } from "@umami/state";
 import { validateMnemonic } from "bip39";
 import { range } from "lodash";
@@ -20,6 +18,7 @@ import { FormProvider, useFieldArray } from "react-hook-form";
 
 import { CloseIcon } from "../../../assets/icons";
 import { useColor } from "../../../styles/useColor";
+import { MnemonicWord } from "../../MnemonicWord";
 import { RadioButtons } from "../../RadioButtons";
 import { SetupPassword } from "../SetupPassword";
 
@@ -114,21 +113,11 @@ export const SeedPhraseTab = () => {
 
           <Grid gridRowGap="16px" gridColumnGap="12px" gridTemplateColumns="repeat(3, 1fr)">
             {fields.map((field, index) => (
-              <GridItem key={field.id}>
-                <Text
-                  position="absolute"
-                  zIndex={1}
-                  marginTop={{ lg: "10px", base: "8px" }}
-                  marginLeft={{ lg: "16px", base: "10px" }}
-                  color={color("black")}
-                  textAlign="right"
-                  size={{ lg: "lg", base: "xs" }}
-                >
-                  {String(index + 1).padStart(2, "0")}.
-                </Text>
-                <MnemonicAutocomplete
-                  inputName={`mnemonic.${index}.val`}
-                  inputProps={{
+              <MnemonicWord
+                key={field.id}
+                autocompleteProps={{
+                  inputName: `mnemonic.${index}.val`,
+                  inputProps: {
                     ...register(`mnemonic.${index}.val`, { required: true }),
                     // eslint-disable-next-line @typescript-eslint/no-misused-promises
                     onPaste: async e => {
@@ -137,9 +126,10 @@ export const SeedPhraseTab = () => {
                     },
                     variant: "mnemonic",
                     placeholder: `word #${index + 1}`,
-                  }}
-                />
-              </GridItem>
+                  },
+                }}
+                index={index}
+              />
             ))}
           </Grid>
           <Button gap="4px" onClick={clearAll} variant="ghost">
diff --git a/apps/web/src/components/Onboarding/SetupPassword/SetupPassword.test.tsx b/apps/web/src/components/Onboarding/SetupPassword/SetupPassword.test.tsx
index ebea73bc2e..bc636efdfb 100644
--- a/apps/web/src/components/Onboarding/SetupPassword/SetupPassword.test.tsx
+++ b/apps/web/src/components/Onboarding/SetupPassword/SetupPassword.test.tsx
@@ -2,24 +2,41 @@ import {
   type UmamiStore,
   generate24WordMnemonic,
   makeStore,
+  useGetDecryptedMnemonic,
+  useIsPasswordSet,
   useRestoreFromMnemonic,
   useRestoreFromSecretKey,
 } from "@umami/state";
 import { mnemonic1 } from "@umami/test-utils";
 
 import { SetupPassword } from "./SetupPassword";
-import { act, fireEvent, renderInModal, screen, userEvent, waitFor } from "../../../testUtils";
+import {
+  act,
+  dynamicModalContextMock,
+  fireEvent,
+  renderInModal,
+  screen,
+  userEvent,
+  waitFor,
+} from "../../../testUtils";
 import { CURVES } from "../AdvancedAccountSettings";
+import { ImportantNoticeModal } from "../VerificationFlow/ImportantNoticeModal";
 
 jest.mock("@umami/state", () => ({
   ...jest.requireActual("@umami/state"),
   useRestoreFromMnemonic: jest.fn(),
   useRestoreFromSecretKey: jest.fn(),
   generate24WordMnemonic: jest.fn(),
+  useGetDecryptedMnemonic: jest.fn(),
+  useIsPasswordSet: jest.fn(),
 }));
 
 const password = "password";
 
+beforeEach(() => {
+  jest.mocked(useGetDecryptedMnemonic).mockReturnValue(() => Promise.resolve(mnemonic1));
+});
+
 describe("<SetupPassword />", () => {
   describe.each(["mnemonic", "secret_key"] as const)("%s mode", mode => {
     describe("validations", () => {
@@ -250,4 +267,26 @@ describe("<SetupPassword />", () => {
       });
     });
   });
+
+  describe("verification mode", () => {
+    it("renders the verification screen", async () => {
+      jest.mocked(useIsPasswordSet).mockReturnValue(true);
+      const { openWith } = dynamicModalContextMock;
+      const user = userEvent.setup();
+
+      await renderInModal(<SetupPassword mode="verification" />);
+
+      const passwordInput = screen.getByLabelText("Password");
+
+      await act(() => user.type(passwordInput, password));
+
+      const submitButton = screen.getByRole("button", { name: "Confirm" });
+
+      await act(() => user.click(submitButton));
+
+      expect(openWith).toHaveBeenCalledWith(<ImportantNoticeModal mnemonic={mnemonic1} />, {
+        size: "xl",
+      });
+    });
+  });
 });
diff --git a/apps/web/src/components/Onboarding/SetupPassword/SetupPassword.tsx b/apps/web/src/components/Onboarding/SetupPassword/SetupPassword.tsx
index 37cc264650..772f05bfe4 100644
--- a/apps/web/src/components/Onboarding/SetupPassword/SetupPassword.tsx
+++ b/apps/web/src/components/Onboarding/SetupPassword/SetupPassword.tsx
@@ -12,12 +12,14 @@ import {
 } from "@chakra-ui/react";
 import { type Curves } from "@taquito/signer";
 import { useDynamicModalContext, useMultiForm } from "@umami/components";
-import { DEFAULT_ACCOUNT_LABEL } from "@umami/core";
+import { DEFAULT_ACCOUNT_LABEL, type MnemonicAccount } from "@umami/core";
 import {
   accountsActions,
   generate24WordMnemonic,
   useAppDispatch,
   useAsyncActionHandler,
+  useCurrentAccount,
+  useGetDecryptedMnemonic,
   useGetNextAvailableAccountLabels,
   useIsPasswordSet,
   useRestoreFromMnemonic,
@@ -33,6 +35,7 @@ import { ModalBackButton } from "../../BackButton";
 import { ModalCloseButton } from "../../CloseButton";
 import { PasswordInput } from "../../PasswordInput";
 import { AdvancedAccountSettings } from "../AdvancedAccountSettings";
+import { ImportantNoticeModal } from "../VerificationFlow/ImportantNoticeModal";
 
 type FormFields = {
   password: string;
@@ -41,26 +44,51 @@ type FormFields = {
   curve: Exclude<Curves, "bip25519">;
 };
 
-type Mode = "mnemonic" | "secret_key" | "new_mnemonic";
+type Mode = "mnemonic" | "secret_key" | "new_mnemonic" | "verification";
 
 type SetupPasswordProps = {
-  mode?: Mode;
-  handleProceedToVerification?: (password: string) => void;
+  mode: Mode;
 };
 
-export const SetupPassword = ({
-  mode,
-  handleProceedToVerification: handleProceedToVerification,
-}: SetupPasswordProps) => {
+const getModeConfig = (mode: Mode) => {
+  switch (mode) {
+    case "verification":
+      return {
+        icon: LockIcon,
+        title: "Confirm password",
+        buttonLabel: "Confirm",
+        subtitle: "Confirm the password to secure your wallet and verification process.",
+      };
+    case "new_mnemonic":
+      return {
+        icon: UserIcon,
+        title: "Create Password",
+        buttonLabel: "Create Account",
+        subtitle: "Set a password to unlock your wallet. Make sure to store your password safely.",
+      };
+    case "mnemonic":
+    case "secret_key":
+      return {
+        icon: LockIcon,
+        title: "Almost there",
+        buttonLabel: "Import Wallet",
+      };
+  }
+};
+
+export const SetupPassword = ({ mode }: SetupPasswordProps) => {
   const color = useColor();
   const { handleAsyncAction, isLoading } = useAsyncActionHandler();
-  const { allFormValues, onClose } = useDynamicModalContext();
+  const dispatch = useAppDispatch();
+
+  const { allFormValues, onClose, openWith } = useDynamicModalContext();
   const restoreFromMnemonic = useRestoreFromMnemonic();
   const restoreFromSecretKey = useRestoreFromSecretKey();
   const checkPassword = useValidateMasterPassword();
   const getNextAvailableAccountLabels = useGetNextAvailableAccountLabels();
   const isPasswordSet = useIsPasswordSet();
-  const dispatch = useAppDispatch();
+  const getDecryptedMnemonic = useGetDecryptedMnemonic();
+  const currentAccount = useCurrentAccount();
 
   const form = useMultiForm<FormFields>({
     mode: "onBlur",
@@ -77,18 +105,6 @@ export const SetupPassword = ({
 
   const isNewMnemonic = mode === "new_mnemonic";
 
-  const onHandleSubmit = (formFields: FormFields) => {
-    if (handleProceedToVerification) {
-      return handleProceedToVerification(formFields.password);
-    }
-
-    if (isNewMnemonic) {
-      dispatch(accountsActions.setPassword(formFields.password));
-    }
-
-    return onSubmit(formFields);
-  };
-
   const onSubmit = ({ password, curve, derivationPath }: FormFields) =>
     handleAsyncAction(async () => {
       const label = getNextAvailableAccountLabels(DEFAULT_ACCOUNT_LABEL)[0];
@@ -118,18 +134,24 @@ export const SetupPassword = ({
             curve,
             isVerified: !isNewMnemonic,
           });
+
+          if (isNewMnemonic) {
+            dispatch(accountsActions.setPassword(password));
+          }
+
           break;
         }
-        default:
-          break;
+        case "verification": {
+          const mnemonic = await getDecryptedMnemonic(currentAccount as MnemonicAccount, password);
+
+          return openWith(<ImportantNoticeModal mnemonic={mnemonic} />, { size: "xl" });
+        }
       }
 
       return onClose();
     });
 
-  const icon = isNewMnemonic ? UserIcon : LockIcon;
-  const title = mode ? (isNewMnemonic ? "Create Password" : "Almost there") : "Confirm password";
-  const buttonLabel = mode ? (isNewMnemonic ? "Create Account" : "Import Wallet") : "Confirm";
+  const { icon, title, buttonLabel, subtitle } = getModeConfig(mode);
 
   return (
     <ModalContent>
@@ -139,20 +161,15 @@ export const SetupPassword = ({
         <Center flexDirection="column" gap="16px">
           <Icon as={icon} width="24px" height="24px" color={color("blue")} />
           <Heading size="xl">{title}</Heading>
-          {isNewMnemonic && (
-            <Text width="full" color={color("700")} fontWeight="400" textAlign="center" size="md">
-              Set a password to unlock your wallet. Make sure to store your password safely.
-            </Text>
-          )}
-          {!mode && (
+          {subtitle && (
             <Text width="full" color={color("700")} fontWeight="400" textAlign="center" size="md">
-              Confirm the password to secure your wallet and verification process.
+              {subtitle}
             </Text>
           )}
         </Center>
       </ModalHeader>
       <FormProvider {...form}>
-        <form onSubmit={form.handleSubmit(onHandleSubmit)}>
+        <form onSubmit={form.handleSubmit(onSubmit)}>
           <ModalBody>
             <Flex flexDirection="column" gap="24px">
               <PasswordInput
diff --git a/apps/web/src/components/Onboarding/VerificationFlow/ImportantNoticeModal.tsx b/apps/web/src/components/Onboarding/VerificationFlow/ImportantNoticeModal.tsx
index 4e120d2b81..c9dafcd95c 100644
--- a/apps/web/src/components/Onboarding/VerificationFlow/ImportantNoticeModal.tsx
+++ b/apps/web/src/components/Onboarding/VerificationFlow/ImportantNoticeModal.tsx
@@ -45,10 +45,10 @@ const items = [
 ];
 
 type ImportantNoticeModalProps = {
-  seedPhrase: string;
+  mnemonic: string;
 };
 
-export const ImportantNoticeModal = ({ seedPhrase }: ImportantNoticeModalProps) => {
+export const ImportantNoticeModal = ({ mnemonic }: ImportantNoticeModalProps) => {
   const color = useColor();
   const { openWith } = useDynamicModalContext();
 
@@ -85,7 +85,7 @@ export const ImportantNoticeModal = ({ seedPhrase }: ImportantNoticeModalProps)
       <ModalFooter>
         <Button
           width="full"
-          onClick={() => openWith(<RecordSeedphraseModal seedPhrase={seedPhrase} />)}
+          onClick={() => openWith(<RecordSeedphraseModal seedPhrase={mnemonic} />, { size: "xl" })}
           variant="primary"
         >
           Next
diff --git a/apps/web/src/components/Onboarding/VerificationFlow/RecordSeedphraseModal.tsx b/apps/web/src/components/Onboarding/VerificationFlow/RecordSeedphraseModal.tsx
index fe46ae2e29..3a7a6a3aa2 100644
--- a/apps/web/src/components/Onboarding/VerificationFlow/RecordSeedphraseModal.tsx
+++ b/apps/web/src/components/Onboarding/VerificationFlow/RecordSeedphraseModal.tsx
@@ -3,7 +3,6 @@ import {
   Center,
   Flex,
   Grid,
-  GridItem,
   Heading,
   Icon,
   ModalBody,
@@ -20,6 +19,7 @@ import { useColor } from "../../../styles/useColor";
 import { ModalBackButton } from "../../BackButton";
 import { ModalCloseButton } from "../../CloseButton";
 import { CopyButton } from "../../CopyButton";
+import { MnemonicWord } from "../../MnemonicWord";
 
 type CopySeedphraseModalProps = {
   seedPhrase: string;
@@ -37,7 +37,7 @@ export const RecordSeedphraseModal = ({ seedPhrase }: CopySeedphraseModalProps)
         <ModalCloseButton />
         <Center flexDirection="column" gap="12px">
           <Icon as={KeyIcon} boxSize="24px" marginBottom="4px" color={color("blue")} />
-          <Heading size="xl">Import Wallet</Heading>
+          <Heading size="xl">Record Seed Phrase</Heading>
           <Text width="full" color={color("700")} fontWeight="400" textAlign="center" size="md">
             Record these 24 words in order to restore your wallet in the future
           </Text>
@@ -51,25 +51,19 @@ export const RecordSeedphraseModal = ({ seedPhrase }: CopySeedphraseModalProps)
           gridTemplateColumns="repeat(3, 1fr)"
         >
           {words.map((word, index) => (
-            <GridItem
+            <MnemonicWord
               key={index}
               as={Flex}
-              alignItems="center"
-              gap={{ base: "6px", lg: "8px" }}
-              maxHeight={{ base: "34px", lg: "48px" }}
-              padding={{ base: "10px 12px", lg: "12px 16px" }}
+              height={{ lg: "48px", base: "34px" }}
+              color="black"
+              border="1px solid"
               borderWidth="1.5px"
               borderStyle="dashed"
               borderColor={color("300")}
               borderRadius="full"
-            >
-              <Text color={color("300")} fontSize={{ base: "xs", lg: "lg" }}>
-                {String(index + 1).padStart(2, "0")}.
-              </Text>
-              <Text fontSize={{ base: "xs", lg: "lg" }} fontWeight="medium">
-                {word}
-              </Text>
-            </GridItem>
+              index={index}
+              word={word}
+            />
           ))}
         </Grid>
         <CopyButton width="full" marginTop="16px" value={seedPhrase} variant="ghost">
diff --git a/apps/web/src/components/Onboarding/VerificationFlow/VerifySeedphraseModal.tsx b/apps/web/src/components/Onboarding/VerificationFlow/VerifySeedphraseModal.tsx
index b8ce0f0da7..4af70142d5 100644
--- a/apps/web/src/components/Onboarding/VerificationFlow/VerifySeedphraseModal.tsx
+++ b/apps/web/src/components/Onboarding/VerificationFlow/VerifySeedphraseModal.tsx
@@ -12,7 +12,7 @@ import {
   ModalHeader,
   Text,
 } from "@chakra-ui/react";
-import { MnemonicAutocomplete, useDynamicModalContext } from "@umami/components";
+import { useDynamicModalContext } from "@umami/components";
 import { selectRandomElements } from "@umami/core";
 import { accountsActions, useAppDispatch, useCurrentAccount } from "@umami/state";
 import { useState } from "react";
@@ -23,6 +23,7 @@ import { IS_DEV } from "../../../env";
 import { useColor } from "../../../styles/useColor";
 import { ModalBackButton } from "../../BackButton";
 import { ModalCloseButton } from "../../CloseButton";
+import { MnemonicWord } from "../../MnemonicWord";
 
 type VerifySeedphraseModalProps = {
   seedPhrase: string;
@@ -35,6 +36,11 @@ export const VerifySeedphraseModal = ({ seedPhrase }: VerifySeedphraseModalProps
   const { onClose } = useDynamicModalContext();
   const form = useForm({
     mode: "onBlur",
+    defaultValues: {
+      word1: "",
+      word2: "",
+      word3: "",
+    },
   });
   const {
     handleSubmit,
@@ -73,43 +79,32 @@ export const VerifySeedphraseModal = ({ seedPhrase }: VerifySeedphraseModalProps
       <FormProvider {...form}>
         <form onSubmit={handleSubmit(onSubmit)}>
           <ModalBody>
-            <Flex gap="12px">
+            <Flex gap={{ base: "8px", md: "12px" }}>
               {randomElements.map(({ index, value }) => {
-                const inputName = `${index}`;
-                const error = errors[inputName];
+                const inputName = `word${index + 1}`;
+                const error = errors[inputName as keyof typeof errors];
 
                 return (
                   <FormControl key={index} isInvalid={!!error}>
-                    <Flex key={index} alignItems="center">
-                      <Text
-                        position="absolute"
-                        zIndex={1}
-                        marginLeft={{ lg: "16px", base: "10px" }}
-                        color={color("black")}
-                        textAlign="right"
-                        size={{ lg: "lg", base: "xs" }}
-                      >
-                        {String(index + 1).padStart(2, "0")}.
-                      </Text>
-                      <MnemonicAutocomplete
-                        inputName={inputName}
-                        inputProps={{
+                    <MnemonicWord
+                      autocompleteProps={{
+                        inputName,
+                        inputProps: {
                           variant: "mnemonic",
                           placeholder: `word #${index + 1}`,
-                        }}
-                        listProps={{
+                        },
+                        listProps: {
                           marginTop: "6px",
-                        }}
-                        validate={_value => {
+                        },
+                        validate: _value => {
                           if (_value !== value) {
                             return "Word doesn't match";
                           }
-                        }}
-                      />
-                    </Flex>
-                    {error?.message && (
-                      <FormErrorMessage>{(error as any).message}</FormErrorMessage>
-                    )}
+                        },
+                      }}
+                      index={index}
+                    />
+                    {error?.message && <FormErrorMessage>{error.message}</FormErrorMessage>}
                   </FormControl>
                 );
               })}
diff --git a/apps/web/src/components/Onboarding/VerificationFlow/index.ts b/apps/web/src/components/Onboarding/VerificationFlow/index.ts
index 9cbe3fc17b..55ea73f028 100644
--- a/apps/web/src/components/Onboarding/VerificationFlow/index.ts
+++ b/apps/web/src/components/Onboarding/VerificationFlow/index.ts
@@ -1,6 +1,2 @@
-export { RecordSeedphraseModal } from "./RecordSeedphraseModal";
-export { VerificationInfoModal } from "./VerificationInfoModal";
 export { VerifyMessage } from "./VerifyMessage";
 export { useIsAccountVerified } from "./useIsAccountVerified";
-export { ImportantNoticeModal } from "./ImportantNoticeModal";
-export { VerifySeedphraseModal } from "./VerifySeedphraseModal";
diff --git a/apps/web/src/components/Onboarding/VerificationFlow/useHandleVerify.test.tsx b/apps/web/src/components/Onboarding/VerificationFlow/useHandleVerify.test.tsx
index 9da565278e..a89afca2e9 100644
--- a/apps/web/src/components/Onboarding/VerificationFlow/useHandleVerify.test.tsx
+++ b/apps/web/src/components/Onboarding/VerificationFlow/useHandleVerify.test.tsx
@@ -28,25 +28,24 @@ beforeEach(() => {
 describe("useHandleVerify", () => {
   it("should open SetupPassword modal if master password is not set", async () => {
     const { openWith } = dynamicModalContextMock;
-    const { result } = renderHook(() => useHandleVerify(), { store });
+    const { result } = renderHook(useHandleVerify, { store });
 
-    await act(async () => await result.current());
+    await act(() => result.current());
 
-    expect(openWith).toHaveBeenCalledWith(
-      <SetupPassword handleProceedToVerification={expect.any(Function)} />
-    );
+    expect(openWith).toHaveBeenCalledWith(<SetupPassword mode="verification" />);
   });
 
   it("should open ImportantNoticeModal modal if master password is set", async () => {
-    (useGetDecryptedMnemonic as jest.Mock).mockImplementation(() => () => mnemonic1);
+    jest.mocked(useGetDecryptedMnemonic).mockReturnValue(() => Promise.resolve(mnemonic1));
+
     store.dispatch(accountsActions.setPassword("password"));
 
     const { openWith } = dynamicModalContextMock;
-    const { result } = renderHook(() => useHandleVerify(), { store });
+    const { result } = renderHook(useHandleVerify, { store });
 
     await act(() => result.current());
 
-    expect(openWith).toHaveBeenCalledWith(<ImportantNoticeModal seedPhrase={mnemonic1} />, {
+    expect(openWith).toHaveBeenCalledWith(<ImportantNoticeModal mnemonic={mnemonic1} />, {
       size: "xl",
     });
   });
diff --git a/apps/web/src/components/Onboarding/VerificationFlow/useHandleVerify.tsx b/apps/web/src/components/Onboarding/VerificationFlow/useHandleVerify.tsx
index aa76ab9188..8070f8630c 100644
--- a/apps/web/src/components/Onboarding/VerificationFlow/useHandleVerify.tsx
+++ b/apps/web/src/components/Onboarding/VerificationFlow/useHandleVerify.tsx
@@ -15,20 +15,16 @@ export const useHandleVerify = () => {
   const currentAccount = useCurrentAccount() as MnemonicAccount;
   const getDecryptedMnemonic = useGetDecryptedMnemonic();
   const { handleAsyncAction } = useAsyncActionHandler();
-  const { password: masterPassword } = useAppSelector(state => state.accounts);
+  const { password } = useAppSelector(state => state.accounts);
 
-  const handleProceedToVerification = async (password: string) =>
+  return () =>
     handleAsyncAction(async () => {
-      const mnemonic = await getDecryptedMnemonic(currentAccount, password);
+      if (password) {
+        const mnemonic = await getDecryptedMnemonic(currentAccount, password);
 
-      return openWith(<ImportantNoticeModal seedPhrase={mnemonic} />, { size: "xl" });
-    });
-
-  return () => {
-    if (masterPassword) {
-      return handleProceedToVerification(masterPassword);
-    }
+        return openWith(<ImportantNoticeModal mnemonic={mnemonic} />, { size: "xl" });
+      }
 
-    return openWith(<SetupPassword handleProceedToVerification={handleProceedToVerification} />);
-  };
+      return openWith(<SetupPassword mode="verification" />);
+    });
 };
diff --git a/apps/web/src/components/Onboarding/VerificationFlow/useIsAccountVerified.test.tsx b/apps/web/src/components/Onboarding/VerificationFlow/useIsAccountVerified.test.tsx
index 8afca001af..61d2c3a141 100644
--- a/apps/web/src/components/Onboarding/VerificationFlow/useIsAccountVerified.test.tsx
+++ b/apps/web/src/components/Onboarding/VerificationFlow/useIsAccountVerified.test.tsx
@@ -1,4 +1,4 @@
-import { mockMnemonicAccount, mockSocialAccount } from "@umami/core";
+import { mockLedgerAccount, mockMnemonicAccount, mockSocialAccount } from "@umami/core";
 import { type UmamiStore, addTestAccount, makeStore } from "@umami/state";
 
 import { useIsAccountVerified } from "./useIsAccountVerified";
@@ -11,24 +11,16 @@ beforeEach(() => {
 });
 
 describe("useIsAccountVerified", () => {
-  it("returns true if the account is not mnemonic", () => {
-    addTestAccount(store, mockSocialAccount(0));
+  it.each([
+    // verified status, account type, account
+    [true, "social", mockSocialAccount(0)],
+    [true, "ledger", mockLedgerAccount(0)],
+    [true, "verified mnemonic", mockMnemonicAccount(0)],
+    [false, "unverified mnemonic", mockMnemonicAccount(0, { isVerified: false })],
+  ])("returns %s for %s account", (isVerified, _, account) => {
+    addTestAccount(store, account);
     const { result } = renderHook(() => useIsAccountVerified(), { store });
 
-    expect(result.current).toBe(true);
-  });
-
-  it("returns true if the account is mnemonic and verified", () => {
-    addTestAccount(store, mockMnemonicAccount(0));
-    const { result } = renderHook(() => useIsAccountVerified(), { store });
-
-    expect(result.current).toBe(true);
-  });
-
-  it("returns false if the account is mnemonic and not verified", () => {
-    addTestAccount(store, mockMnemonicAccount(0, { isVerified: false }));
-    const { result } = renderHook(() => useIsAccountVerified(), { store });
-
-    expect(result.current).toBe(false);
+    expect(result.current).toBe(isVerified);
   });
 });
diff --git a/packages/state/src/hooks/getAccountData.ts b/packages/state/src/hooks/getAccountData.ts
index 65f85f9073..899fde7f67 100644
--- a/packages/state/src/hooks/getAccountData.ts
+++ b/packages/state/src/hooks/getAccountData.ts
@@ -165,8 +165,8 @@ export const useGetMostFundedImplicitAccount = () => {
 };
 
 export const useGetSecretKey = () => {
-  const seedPhrases = useSeedPhrases();
   const encryptedSecretKeys = useSecretKeys();
+  const getDecryptedMnemonic = useGetDecryptedMnemonic();
 
   return async (account: MnemonicAccount | SecretKeyAccount, password: string) => {
     if (account.type === "secret_key") {
@@ -178,12 +178,7 @@ export const useGetSecretKey = () => {
       return decrypt(encryptedSecretKey, password);
     }
 
-    const encryptedMnemonic = seedPhrases[account.seedFingerPrint];
-    if (!encryptedMnemonic) {
-      throw new Error(`Missing seedphrase for account ${account.address.pkh}`);
-    }
-
-    const mnemonic = await decrypt(encryptedMnemonic, password);
+    const mnemonic = await getDecryptedMnemonic(account, password);
     return deriveSecretKey(mnemonic, account.derivationPath, account.curve);
   };
 };
@@ -216,7 +211,6 @@ export const useGetDecryptedMnemonic = () => {
       throw new Error(`Missing seedphrase for account ${account.address.pkh}`);
     }
 
-    const mnemonic = await decrypt(encryptedMnemonic, password);
-    return mnemonic;
+    return decrypt(encryptedMnemonic, password);
   };
 };