diff --git a/src/pages/CreateWallet.tsx b/src/pages/CreateWallet.tsx
index efb2d29..ba41667 100644
--- a/src/pages/CreateWallet.tsx
+++ b/src/pages/CreateWallet.tsx
@@ -18,31 +18,36 @@ export enum Tabs {
 
 export default function CreateWallet () {
   const [ tab, setTab ] = useState(Tabs.Landing)
-  const [ mnemonic, setMnemonic ] = useState<string | undefined>()
+  const [ sensitive, setSensitive ] = useState("")
+  const [ isImport, setIsImport ] = useState(false)
 
   const navigate = useNavigate()
   const kaspa = useKaspa()
 
   return (
     {
-      [ Tabs.Landing ]: <Landing forward={tab => { setTab(tab) }} />,
-      [ Tabs.Intro ]: <Intro onConfirm={() => { setTab(Tabs.Password) }} />,
-      [ Tabs.Import ]: <Import onMnemonicsSubmit={async (mnemonic) => {
-        setMnemonic(mnemonic)
-        setTab(Tabs.Password)
+      [ Tabs.Landing ]: <Landing forward={tab => { 
+        if (tab === Tabs.Password) setIsImport(true)
+        setTab(tab) 
       }} />,
+      [ Tabs.Intro ]: <Intro onConfirm={() => { setTab(Tabs.Password) }} />,
       [ Tabs.Password ]: <Password onPasswordSet={async (password) => {
-        if (mnemonic) {
-          await kaspa.request('wallet:import', [ mnemonic, password ])
-          navigate('/')
+        if (isImport) {
+          setSensitive(password)
+          setTab(Tabs.Import)
         } else {
-          const generatedMnemonic = await kaspa.request('wallet:create', [ password ])
-
-          setMnemonic(generatedMnemonic)
+          const mnemonic = await kaspa.request('wallet:create', [ password ])
+          
+          setSensitive(mnemonic)
           setTab(Tabs.Create)
         }
       }} />,
-      [ Tabs.Create ]: <Create mnemonic={mnemonic!} onSaved={() => { navigate('/') }} />
+      [ Tabs.Import ]: <Import onMnemonicsSubmit={async (mnemonic) => {
+        await kaspa.request('wallet:import', [ mnemonic, sensitive ]) // TODO: in case of error, tell its an invalid mnemonics
+
+        navigate('/wallet')
+      }} />,
+      [ Tabs.Create ]: <Create mnemonic={sensitive} onSaved={() => { navigate('/wallet') }} />
     }[tab]
   )
 }
diff --git a/src/pages/CreateWallet/Import.tsx b/src/pages/CreateWallet/Import.tsx
index 213efdc..53dce42 100644
--- a/src/pages/CreateWallet/Import.tsx
+++ b/src/pages/CreateWallet/Import.tsx
@@ -29,7 +29,7 @@ export default function Import ({ onMnemonicsSubmit }: {
             onMnemonicsSubmit(mnemonic)
           }}
         >
-          {i18n.getMessage('importWallet')}
+          Import
         </Button>
       </div>
     </main>
diff --git a/src/pages/CreateWallet/Landing.tsx b/src/pages/CreateWallet/Landing.tsx
index e3da789..692acda 100644
--- a/src/pages/CreateWallet/Landing.tsx
+++ b/src/pages/CreateWallet/Landing.tsx
@@ -34,7 +34,7 @@ export default function Landing({ forward }: {
           <Button
             className={"gap-2"}
             onClick={() => {
-              forward(Tabs.Import)
+              forward(Tabs.Password)
             }}
           >
             <Import />