diff --git a/app/screens/WalletNavigator/WalletNavigator.tsx b/app/screens/WalletNavigator/WalletNavigator.tsx
index ecd96194cd..6d165cc063 100644
--- a/app/screens/WalletNavigator/WalletNavigator.tsx
+++ b/app/screens/WalletNavigator/WalletNavigator.tsx
@@ -131,7 +131,7 @@ export function WalletNavigator (): JSX.Element {
           name='EnrollBiometric'
           component={EnrollBiometric}
           options={{
-            headerTitle: translate('screens/WalletNavigator', 'Wallet Created')
+            headerTitle: translate('screens/WalletNavigator', 'Secure your wallet')
           }}
         />
       </WalletStack.Navigator>
diff --git a/app/screens/WalletNavigator/screens/CreateWallet/PinCreation.tsx b/app/screens/WalletNavigator/screens/CreateWallet/PinCreation.tsx
index 6277f390c9..b8cbe7012f 100644
--- a/app/screens/WalletNavigator/screens/CreateWallet/PinCreation.tsx
+++ b/app/screens/WalletNavigator/screens/CreateWallet/PinCreation.tsx
@@ -19,7 +19,10 @@ export function PinCreation ({ route }: Props): JSX.Element {
   const [newPin, setNewPin] = useState('')
 
   return (
-    <ScrollView style={tailwind('w-full flex-1 flex-col bg-white')}>
+    <ScrollView
+      testID='screen_create_pin'
+      style={tailwind('w-full flex-1 flex-col bg-white')}
+    >
       <CreateWalletStepIndicator
         current={3}
         steps={CREATE_STEPS}
diff --git a/app/screens/WalletNavigator/screens/RestoreWallet/RestoreMnemonicWallet.tsx b/app/screens/WalletNavigator/screens/RestoreWallet/RestoreMnemonicWallet.tsx
index c5c788a879..ba5d6b22f7 100644
--- a/app/screens/WalletNavigator/screens/RestoreWallet/RestoreMnemonicWallet.tsx
+++ b/app/screens/WalletNavigator/screens/RestoreWallet/RestoreMnemonicWallet.tsx
@@ -1,22 +1,20 @@
 import { validateMnemonicSentence } from '@defichain/jellyfish-wallet-mnemonic'
+import { NavigationProp, useNavigation } from '@react-navigation/native'
 import * as React from 'react'
 import { createRef, useEffect, useState } from 'react'
 import { Controller, useForm } from 'react-hook-form'
 import { Alert, TextInput } from 'react-native'
 import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view'
-import { MnemonicUnprotected } from '../../../../api/wallet/provider/mnemonic_unprotected'
 import { Text, View } from '../../../../components'
 import { Button } from '../../../../components/Button'
 import { SectionTitle } from '../../../../components/SectionTitle'
-import { useNetworkContext } from '../../../../contexts/NetworkContext'
-import { useWalletPersistenceContext } from '../../../../contexts/WalletPersistenceContext'
 import { tailwind } from '../../../../tailwind'
 import { translate } from '../../../../translations'
 import LoadingScreen from '../../../LoadingNavigator/LoadingScreen'
+import { WalletParamList } from '../../WalletNavigator'
 
 export function RestoreMnemonicWallet (): JSX.Element {
-  const { network } = useNetworkContext()
-  const { setWallet } = useWalletPersistenceContext()
+  const navigation = useNavigation<NavigationProp<WalletParamList>>()
   const { control, formState: { isValid }, getValues } = useForm({ mode: 'onChange' })
   const [recoveryWords] = useState<number[]>(Array.from(Array(24), (v, i) => i + 1))
   const [isSubmitting, setIsSubmitting] = useState(false)
@@ -38,7 +36,9 @@ export function RestoreMnemonicWallet (): JSX.Element {
     const words = Object.values(getValues())
     if (isValid && validateMnemonicSentence(words)) {
       setIsSubmitting(false)
-      await setWallet(MnemonicUnprotected.toData(words, network))
+      navigation.navigate('PinCreation', {
+        words, pinLength: 6
+      })
     } else {
       setIsSubmitting(false)
       Alert.alert(
diff --git a/cypress/integration/functional/onboarding/createMnemonicWallet.spec.ts b/cypress/integration/functional/onboarding/createMnemonicWallet.spec.ts
index 4a41a4f829..07232f7a4c 100644
--- a/cypress/integration/functional/onboarding/createMnemonicWallet.spec.ts
+++ b/cypress/integration/functional/onboarding/createMnemonicWallet.spec.ts
@@ -59,6 +59,6 @@ context('wallet/createmnemonic', () => {
     })
     cy.getByTestID('recover_wallet_button').should('not.have.attr', 'disabled')
     cy.getByTestID('recover_wallet_button').click().wait(2000)
-    cy.getByTestID('balances_list').should('exist')
+    cy.getByTestID('screen_create_pin').should('exist')
   })
 })
diff --git a/cypress/integration/functional/onboarding/restore.spec.ts b/cypress/integration/functional/onboarding/restore.spec.ts
index 25f66db18b..12f9a324be 100644
--- a/cypress/integration/functional/onboarding/restore.spec.ts
+++ b/cypress/integration/functional/onboarding/restore.spec.ts
@@ -32,6 +32,6 @@ context('wallet/recover', () => {
   it('should be able to submit form', function () {
     cy.getByTestID('recover_wallet_button').should('not.have.attr', 'disabled')
     cy.getByTestID('recover_wallet_button').click().wait(2000)
-    cy.getByTestID('balances_list').should('exist')
+    cy.getByTestID('screen_create_pin').should('exist')
   })
 })