diff --git a/app/src/main/java/org/linphone/contact/ContactSelectionData.kt b/app/src/main/java/org/linphone/contact/ContactSelectionData.kt
index ccd0b072d..acade9afd 100644
--- a/app/src/main/java/org/linphone/contact/ContactSelectionData.kt
+++ b/app/src/main/java/org/linphone/contact/ContactSelectionData.kt
@@ -55,7 +55,9 @@ class ContactSelectionData(private val searchResult: SearchResult) : ContactData
     }
 
     val hasLimeX3DHCapability: Boolean
-        get() = searchResult.hasCapability(FriendCapability.LimeX3Dh)
+        get() = LinphoneUtils.isEndToEndEncryptedChatAvailable() && searchResult.hasCapability(
+            FriendCapability.LimeX3Dh
+        )
 
     init {
         isDisabled.value = false
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index a482b4c8d..12432dccd 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -165,6 +165,12 @@ class CoreContext(
             }
         }
 
+        override fun onAuthenticationRequested(core: Core, authInfo: AuthInfo, method: AuthMethod) {
+            Log.w(
+                "[Context] Authentication requested for account [${authInfo.username}@${authInfo.domain}] with realm [${authInfo.realm}] using method [$method]"
+            )
+        }
+
         override fun onPushNotificationReceived(core: Core, payload: String?) {
             Log.i("[Context] Push notification received: $payload")
         }
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5dbb3116a..af31bf418 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -82,7 +82,7 @@
     <string name="contact_new_choose_sync_account">Choisissez où enregistrer le contact</string>
     <string name="contact_local_sync_account">Enregistrer localement</string>
     <string name="chat_event_participant_removed">%s a quitté le groupe</string>
-    <string name="debug_popup_title">Activer les traces de débogage</string>
+    <string name="debug_popup_title">Débogage</string>
     <string name="debug_popup_enable_logs">Activer les traces</string>
     <string name="debug_popup_disable_logs">Désactiver les traces</string>
     <string name="debug_popup_send_logs">Envoyer les traces</string>