diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
index 9d2d140ee..2d49bf6a8 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
@@ -385,9 +385,9 @@ class EntryEditActivity : DatabaseLockActivity(),
                             TypeMode.MAGIKEYBOARD ->
                                 entryValidatedForKeyboardSelection(database, entrySave.newEntry)
                             TypeMode.PASSKEY ->
-                                entryValidatedForPasskeySelection(database, entrySave.newEntry)
+                                entryValidatedForPasskey(database, entrySave.newEntry)
                             TypeMode.AUTOFILL ->
-                                entryValidatedForAutofillSelection(database, entrySave.newEntry)
+                                entryValidatedForAutofill(database, entrySave.newEntry)
                         }
                     },
                     registrationAction = { intentSender, typeMode, registerInfo ->
@@ -395,9 +395,9 @@ class EntryEditActivity : DatabaseLockActivity(),
                             TypeMode.DEFAULT -> {}
                             TypeMode.MAGIKEYBOARD -> {}
                             TypeMode.PASSKEY ->
-                                entryValidatedForPasskeyRegistration(database, entrySave.newEntry)
+                                entryValidatedForPasskey(database, entrySave.newEntry)
                             TypeMode.AUTOFILL ->
-                                entryValidatedForAutofillRegistration(database, entrySave.newEntry)
+                                entryValidatedForAutofill(database, entrySave.newEntry)
                         }
                     }
                 )
@@ -451,9 +451,9 @@ class EntryEditActivity : DatabaseLockActivity(),
                                         TypeMode.MAGIKEYBOARD ->
                                             entryValidatedForKeyboardSelection(database, entry)
                                         TypeMode.PASSKEY ->
-                                            entryValidatedForPasskeySelection(database, entry)
+                                            entryValidatedForPasskey(database, entry)
                                         TypeMode.AUTOFILL ->
-                                            entryValidatedForAutofillSelection(database, entry)
+                                            entryValidatedForAutofill(database, entry)
                                     }
                                 },
                                 registrationAction = { _, typeMode, _ ->
@@ -462,9 +462,9 @@ class EntryEditActivity : DatabaseLockActivity(),
                                             entryValidatedForSave(entry)
                                         TypeMode.MAGIKEYBOARD -> {}
                                         TypeMode.PASSKEY ->
-                                            entryValidatedForPasskeyRegistration(database, entry)
+                                            entryValidatedForPasskey(database, entry)
                                         TypeMode.AUTOFILL ->
-                                            entryValidatedForAutofillRegistration(database, entry)
+                                            entryValidatedForAutofill(database, entry)
                                     }
                                 }
                             )
@@ -494,7 +494,7 @@ class EntryEditActivity : DatabaseLockActivity(),
         finishForEntryResult(entry)
     }
 
-    private fun entryValidatedForAutofillSelection(database: ContextualDatabase, entry: Entry) {
+    private fun entryValidatedForAutofill(database: ContextualDatabase, entry: Entry) {
         // Build Autofill response with the entry selected
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             this.buildSpecialModeResponseAndSetResult(
@@ -505,27 +505,7 @@ class EntryEditActivity : DatabaseLockActivity(),
         onValidateSpecialMode()
     }
 
-    private fun entryValidatedForPasskeySelection(database: ContextualDatabase, entry: Entry) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-            this.buildPasskeyResponseAndSetResult(
-                entryInfo = entry.getEntryInfo(database),
-                extras = buildEntryResult(entry)
-            )
-        }
-        onValidateSpecialMode()
-    }
-
-    private fun entryValidatedForAutofillRegistration(database: ContextualDatabase, entry: Entry) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            this.buildSpecialModeResponseAndSetResult(
-                entryInfo = entry.getEntryInfo(database),
-                extras = buildEntryResult(entry)
-            )
-        }
-        onValidateSpecialMode()
-    }
-
-    private fun entryValidatedForPasskeyRegistration(database: ContextualDatabase, entry: Entry) {
+    private fun entryValidatedForPasskey(database: ContextualDatabase, entry: Entry) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
             this.buildPasskeyResponseAndSetResult(
                 entryInfo = entry.getEntryInfo(database),
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
index 88e03ac77..03fea2da7 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
@@ -19,7 +19,6 @@
  */
 package com.kunzisoft.keepass.activities
 
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -341,7 +340,8 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
                 { onValidateSpecialMode() },
                 { onCancelSpecialMode() },
                 { onLaunchActivitySpecialMode() },
-                mCredentialActivityResultLauncher)
+                mCredentialActivityResultLauncher
+            )
         }
     }
 
@@ -515,9 +515,9 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
          */
         fun launchForRegistration(
             context: Context,
-            activityResultLauncher: ActivityResultLauncher<Intent>?,
+            typeMode: TypeMode,
             registerInfo: RegisterInfo? = null,
-            typeMode: TypeMode
+            activityResultLauncher: ActivityResultLauncher<Intent>?,
         ) {
             EntrySelectionHelper.startActivityForRegistrationModeResult(
                 context = context,
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 54dc4bc14..db586c2aa 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt
@@ -1546,10 +1546,10 @@ class GroupActivity : DatabaseLockActivity(),
          */
         fun launchForRegistration(
             context: Context,
-            activityResultLauncher: ActivityResultLauncher<Intent>?,
             database: ContextualDatabase,
+            typeMode: TypeMode,
             registerInfo: RegisterInfo? = null,
-            typeMode: TypeMode
+            activityResultLauncher: ActivityResultLauncher<Intent>?,
         ) {
             if (database.loaded && !database.isReadOnly) {
                 checkTimeAndBuildIntent(context, null) { intent ->
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 d77d5de0e..9239f3d9d 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
@@ -133,33 +133,33 @@ class PasskeyLauncherActivity : DatabaseLockActivity() {
                             context = this@PasskeyLauncherActivity,
                             database = uiState.database,
                             typeMode = uiState.typeMode,
-                            activityResultLauncher = mPasskeySelectionActivityResultLauncher,
-                            searchInfo = uiState.searchInfo
+                            searchInfo = uiState.searchInfo,
+                            activityResultLauncher = mPasskeySelectionActivityResultLauncher
                         )
                     }
                     is CredentialLauncherViewModel.UIState.LaunchGroupActivityForRegistration -> {
                         GroupActivity.launchForRegistration(
                             context = this@PasskeyLauncherActivity,
-                            activityResultLauncher = mPasskeyRegistrationActivityResultLauncher,
                             database = uiState.database,
+                            typeMode = uiState.typeMode,
                             registerInfo = uiState.registerInfo,
-                            typeMode = uiState.typeMode
+                            activityResultLauncher = mPasskeyRegistrationActivityResultLauncher
                         )
                     }
                     is CredentialLauncherViewModel.UIState.LaunchFileDatabaseSelectActivityForSelection -> {
                         FileDatabaseSelectActivity.launchForSelection(
                             context = this@PasskeyLauncherActivity,
                             typeMode = uiState.typeMode,
-                            activityResultLauncher = mPasskeySelectionActivityResultLauncher,
                             searchInfo = uiState.searchInfo,
+                            activityResultLauncher = mPasskeySelectionActivityResultLauncher
                         )
                     }
                     is CredentialLauncherViewModel.UIState.LaunchFileDatabaseSelectActivityForRegistration -> {
                         FileDatabaseSelectActivity.launchForRegistration(
                             context = this@PasskeyLauncherActivity,
-                            activityResultLauncher = mPasskeyRegistrationActivityResultLauncher,
+                            typeMode = uiState.typeMode,
                             registerInfo = uiState.registerInfo,
-                            typeMode = uiState.typeMode
+                            activityResultLauncher = mPasskeyRegistrationActivityResultLauncher,
                         )
                     }
                 }