diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapBottomSheet.kt b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapBottomSheet.kt
index 26c8ed25f9..e48c674159 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapBottomSheet.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapBottomSheet.kt
@@ -162,9 +162,10 @@ class BootstrapBottomSheet : VectorBaseBottomSheetDialogFragment() {
                     is BootstrapStep.GetBackupSecretPassForMigration -> state.step.useKey
                     else                                             -> true
                 }
+                val drawableRes = if (isKey) R.drawable.ic_message_key else R.drawable.ic_message_password
                 bootstrapIcon.setImageDrawable(ContextCompat.getDrawable(
                         requireContext(),
-                        R.drawable.ic_message_key.takeIf { isKey } ?: R.drawable.ic_message_password)
+                        drawableRes)
                 )
                 bootstrapTitleText.text = getString(R.string.upgrade_security)
                 showFragment(BootstrapMigrateBackupFragment::class, Bundle())
diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt
index 589f397864..f1847e5ab5 100644
--- a/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/crypto/recover/BootstrapMigrateBackupFragment.kt
@@ -125,8 +125,8 @@ class BootstrapMigrateBackupFragment @Inject constructor(
 
         val secret = bootstrapMigrateEditText.text?.toString()
         if (secret.isNullOrBlank()) {
-            bootstrapRecoveryKeyEnterTil.error = getString(R.string.recovery_key_empty_error_message).takeIf { isEnteringKey }
-                    ?: getString(R.string.passphrase_empty_error_message)
+            val errRes = if (isEnteringKey) R.string.recovery_key_empty_error_message else R.string.passphrase_empty_error_message
+            bootstrapRecoveryKeyEnterTil.error = getString(errRes)
         } else if (isEnteringKey && !isValidRecoveryKey(secret)) {
             bootstrapRecoveryKeyEnterTil.error = getString(R.string.bootstrap_invalid_recovery_key)
         } else {
diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml
index a7da659b2d..2cd97098af 100644
--- a/vector/src/main/res/values/strings_riotX.xml
+++ b/vector/src/main/res/values/strings_riotX.xml
@@ -32,7 +32,6 @@
     <!-- To produce things like 'RiotX Android (IQDHUVJTTV)' -->
     <string name="new_session_review_with_info">%1$s (%2$s)</string>
 
-    <!-- %s will be replaced by account_password -->
     <string name="bootstrap_migration_enter_backup_password">Enter your Key Backup Passphrase to continue.</string>
     <string name="bootstrap_migration_use_recovery_key">use your Key Backup recovery key</string>
     <!-- %s will be replaced by the value of bootstrap_migration_use_recovery_key  -->