diff --git a/CHANGELOG b/CHANGELOG
index e9d217bc0..b33a0b1d0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,7 +6,7 @@ KeePassDX(4.2.0)
  * Change Passkey Backup Eligibility & Backup State #2135 #2150 #2212
  * Search settings #2112 #2181 #2187
  * Autofill refactoring #765 #2196
- * Small fixes #2157 #2164 #2171 #2122 #2180 #2209
+ * Small fixes #2157 #2164 #2171 #2122 #2180 #2209 #2214
 
 KeePassDX(4.1.9)
  * Fix landscape UI #2198 #2200 (@chenxiaolong)
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
index ba7c69e60..e061a27c2 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt
@@ -520,7 +520,7 @@ class EntryActivity : DatabaseLockActivity() {
         // Transit data in previous Activity after an update
         Intent().apply {
             putExtra(EntryEditActivity.ADD_OR_UPDATE_ENTRY_KEY, mMainEntryId)
-            setResult(Activity.RESULT_OK, this)
+            setResult(RESULT_OK, this)
         }
         super.finish()
     }
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
index 6291e1e58..195b20509 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
@@ -892,7 +892,6 @@ class GroupActivity : DatabaseLockActivity(),
                     },
                     registrationAction = { intentSenderMode, typeMode, registerInfo ->
                         if (!database.isReadOnly) {
-                            // TODO Ask to overwrite data
                             entrySelectedForRegistration(
                                 database = database,
                                 entry = entryVersioned,
diff --git a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/PasskeyLauncherActivity.kt b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/PasskeyLauncherActivity.kt
index 79f72695f..bdbbf5df6 100644
--- a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/PasskeyLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/PasskeyLauncherActivity.kt
@@ -176,7 +176,8 @@ class PasskeyLauncherActivity : DatabaseLockActivity() {
         super.onDatabaseActionFinished(database, actionTask, result)
         when (actionTask) {
             ACTION_DATABASE_UPDATE_ENTRY_TASK -> {
-                passkeyLauncherViewModel.autoSelectPasskey(result, database)
+                // TODO When auto save is enabled, WARNING filter by the calling activity
+                // passkeyLauncherViewModel.autoSelectPasskey(result, database)
             }
         }
     }
diff --git a/fastlane/metadata/android/en-US/changelogs/145.txt b/fastlane/metadata/android/en-US/changelogs/145.txt
index 55bb30360..4e15a2773 100644
--- a/fastlane/metadata/android/en-US/changelogs/145.txt
+++ b/fastlane/metadata/android/en-US/changelogs/145.txt
@@ -1,2 +1,3 @@
  * Passkeys management #1421
- * Add KPEX_PASSKEY_FLAG_BE and KPEX_PASSKEY_FLAG_BS flags #2212
\ No newline at end of file
+ * Add KPEX_PASSKEY_FLAG_BE and KPEX_PASSKEY_FLAG_BS flags #2212
+ * Small fixes #2214
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/145.txt b/fastlane/metadata/android/fr-FR/changelogs/145.txt
index 3ad2e06cb..798c24dcb 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/145.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/145.txt
@@ -1,2 +1,3 @@
  * Gestion de Passkeys #1421
- * Ajout des flags KPEX_PASSKEY_FLAG_BE et KPEX_PASSKEY_FLAG_BS #2212
\ No newline at end of file
+ * Ajout des flags KPEX_PASSKEY_FLAG_BE et KPEX_PASSKEY_FLAG_BS #2212
+ * Petites corrections #2214
\ No newline at end of file