diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
index 2f58bb300b..29cdd561b2 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt
@@ -237,11 +237,13 @@ private fun handleBackupAction(action: BackupAction) {
                     AccessCodeError.CodeTooShort
                 ))
             } else {
+                store.dispatch(BackupAction.SetAccessCodeError(null))
                 store.dispatch(BackupAction.SaveFirstAccessCode(action.accessCode))
             }
         }
         is BackupAction.SaveAccessCodeConfirmation -> {
             if (action.accessCodeConfirmation == backupState.accessCode) {
+                store.dispatch(BackupAction.SetAccessCodeError(null))
                 backupService.setAccessCode(action.accessCodeConfirmation)
                 store.dispatch(BackupAction.PrepareToWritePrimaryCard)
             } else {
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt
index ce0c07b3c6..f46c1bf0ff 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletReducer.kt
@@ -60,7 +60,7 @@ class BackupReducer {
                     state.copy(backupStep = BackupStep.SetAccessCode)
                 }
                 BackupAction.ShowEnterAccessCodeScreen -> {
-                    state.copy(backupStep = BackupStep.EnterAccessCode)
+                    state.copy(backupStep = BackupStep.EnterAccessCode, accessCodeError = null)
                 }
                 is BackupAction.SaveFirstAccessCode -> {
                     state.copy(
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
index 30dc5affba..27fe4c8eb7 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
@@ -15,7 +15,6 @@ import com.tangem.common.core.CardIdDisplayFormat
 import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapfrogWidget
 import com.tangem.tap.common.extensions.hide
 import com.tangem.tap.common.extensions.show
-import com.tangem.tap.common.postUi
 import com.tangem.tap.features.FragmentOnBackPressedHandler
 import com.tangem.tap.features.addBackPressHandler
 import com.tangem.tap.features.onboarding.products.wallet.redux.*
@@ -253,15 +252,11 @@ class OnboardingWalletFragment : Fragment(R.layout.fragment_onboarding_wallet),
     private fun showEnterAccessCode(state: BackupState) {
         accessCodeDialog?.showEnterAccessCode()
         accessCodeDialog?.showError(state.accessCodeError)
-        postUi(2000) { store.dispatch(BackupAction.SetAccessCodeError(null)) }
-
     }
 
     private fun showReenterAccessCode(state: BackupState) {
         accessCodeDialog?.showReenterAccessCode()
         accessCodeDialog?.showError(state.accessCodeError)
-        postUi(2000) { store.dispatch(BackupAction.SetAccessCodeError(null)) }
-
     }
 
     private fun showWritePrimaryCard(state: BackupState) {
@@ -350,7 +345,7 @@ class OnboardingWalletFragment : Fragment(R.layout.fragment_onboarding_wallet),
         tab_layout_backup_info.hide()
 
         tv_body.text = text
-        btn_main_action.text = getText(R.string.common_continue)
+        btn_main_action.text = getText(R.string.onboarding_button_continue_wallet)
         btn_alternative_action.hide()
         btn_main_action.setOnClickListener {
             lav_confetti.cancelAnimation()