diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config
index 0cf3af21e6..e80938f7d9 160000
--- a/app/src/main/assets/tangem-app-config
+++ b/app/src/main/assets/tangem-app-config
@@ -1 +1 @@
-Subproject commit 0cf3af21e6f441e6323a1ba127ee7518168797df
+Subproject commit e80938f7d9ba378a91ac544a9170597e64afa696
diff --git a/app/src/main/java/com/tangem/tap/domain/twins/CreateSecondTwinWalletTask.kt b/app/src/main/java/com/tangem/tap/domain/twins/CreateSecondTwinWalletTask.kt
index bd406430fe..966fe4f1d1 100644
--- a/app/src/main/java/com/tangem/tap/domain/twins/CreateSecondTwinWalletTask.kt
+++ b/app/src/main/java/com/tangem/tap/domain/twins/CreateSecondTwinWalletTask.kt
@@ -6,6 +6,7 @@ import com.tangem.common.KeyPair
 import com.tangem.common.card.EllipticCurve
 import com.tangem.common.core.CardSession
 import com.tangem.common.core.CardSessionRunnable
+import com.tangem.common.core.TangemSdkError
 import com.tangem.common.extensions.hexToBytes
 import com.tangem.operations.wallet.CreateWalletCommand
 import com.tangem.operations.wallet.CreateWalletResponse
diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt
index cfd00ae031..91f7a75152 100644
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsReducer.kt
@@ -64,7 +64,6 @@ private fun handlePrepareScreen(action: DetailsAction.PrepareScreen, state: Deta
             appCurrencyState = AppCurrencyState(
                     action.fiatCurrencyName
             ),
-            securityScreenState = SecurityScreenState(currentOption = securityOption),
             createTwinWalletState = twinsState,
             cardTermsOfUseUrl = action.cardTou.getUrl(action.card)
     )
@@ -174,14 +173,15 @@ private fun handleSecurityAction(
         }
         is DetailsAction.ManageSecurity.SaveChanges.Success -> {
             // Setting options to show only LongTap from now on for non-twins
-            val currentOption = state.securityScreenState?.selectedOption
             state.copy(
-                    securityScreenState = state.securityScreenState?.copy(
-                            currentOption = currentOption,
-                            allowedOptions = state.card?.let {
-                                prepareAllowedSecurityOptions(it, currentOption) }
-                                ?: EnumSet.of(SecurityOption.LongTap)
-                    ))
+                securityScreenState = state.securityScreenState?.copy(
+                    currentOption = state.securityScreenState.selectedOption,
+                    allowedOptions = state.card?.let {
+                        prepareAllowedSecurityOptions(
+                            it, state.securityScreenState.selectedOption
+                        )
+                    } ?: EnumSet.of(SecurityOption.LongTap)
+                ))
         }
 
         else -> state
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
index 153078f584..8a680fcf1c 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
@@ -108,14 +108,8 @@ class WalletMiddleware {
                                 )
                                 when (result) {
                                     is CompletionResult.Success -> {
-                                        val card = globalState?.scanNoteResponse?.card?.let {
-                                            result.data.copy(
-                                                isPin1Default = it.isPin1Default,
-                                                isPin2Default = it.isPin2Default,
-                                            )
-                                        } ?: result.data
                                         val scanNoteResponse =
-                                                globalState?.scanNoteResponse?.copy(card = card)
+                                            globalState?.scanNoteResponse?.copy(card = result.data)
                                         scanNoteResponse?.let {
                                             globalState.tapWalletManager.onCardScanned(scanNoteResponse)
                                         }