diff --git a/app/src/main/assets/assistant_linphone_default_values b/app/src/main/assets/assistant_linphone_default_values
index 3081b5caa..e682dea1d 100644
--- a/app/src/main/assets/assistant_linphone_default_values
+++ b/app/src/main/assets/assistant_linphone_default_values
@@ -21,6 +21,7 @@
     <entry name="cpim_in_basic_chat_rooms_enabled" overwrite="true">1</entry>
     <entry name="rtp_bundle" overwrite="true">1</entry>
     <entry name="lime_server_url" overwrite="true">https://lime.linphone.org/lime-server/lime-server.php</entry>
+    <entry name="lime_algo" overwrite="true">c25519</entry>
   </section>
   <section name="nat_policy_default_values">
     <entry name="stun_server" overwrite="true">stun.linphone.org</entry>
diff --git a/app/src/main/assets/assistant_third_party_default_values b/app/src/main/assets/assistant_third_party_default_values
index 0119b2b1d..c0816ab3d 100644
--- a/app/src/main/assets/assistant_third_party_default_values
+++ b/app/src/main/assets/assistant_third_party_default_values
@@ -21,6 +21,7 @@
     <entry name="cpim_in_basic_chat_rooms_enabled" overwrite="true">0</entry>
     <entry name="rtp_bundle" overwrite="true">0</entry>
     <entry name="lime_server_url" overwrite="true"></entry>
+    <entry name="lime_algo" overwrite="true"></entry>
   </section>
   <section name="nat_policy_default_values">
     <entry name="stun_server" overwrite="true">stun.linphone.org</entry>
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index 9d61d03cd..26df02d2d 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -474,57 +474,15 @@ class CoreContext
             Log.w("$TAG Migrating configuration to [$currentVersion]")
 
             if (oldVersion < 600000) { // 6.0.0 initial release
-                val policy = core.videoActivationPolicy.clone()
-                policy.automaticallyInitiate = false
-                policy.automaticallyAccept = true
-                policy.automaticallyAcceptDirection = MediaDirection.RecvOnly
-                core.videoActivationPolicy = policy
-                Log.i(
-                    "$TAG Updated video activation policy to disable auto initiate, enable auto accept with media direction RecvOnly"
-                )
-
-                core.isFecEnabled = true
-                Log.i("$TAG Video FEC has been enabled")
-
-                core.config.setBool("magic_search", "return_empty_friends", true)
-                Log.i("$TAG Showing 'empty' friends enabled")
-
-                if (LinphoneUtils.getDefaultAccount()?.params?.domain == corePreferences.defaultDomain) {
-                    corePreferences.contactsFilter = corePreferences.defaultDomain
-                    Log.i(
-                        "$TAG Setting default contacts list filter to [${corePreferences.contactsFilter}]"
-                    )
-                }
-
-                Log.i("$TAG Making sure both RFC2833 & SIP INFO are enabled for DTMFs")
-                core.useRfc2833ForDtmf = true
-                core.useInfoForDtmf = true
-
-                // Add that flag back, was disabled for a time during dev process
-                core.config.setBool("misc", "hide_empty_chat_rooms", true)
-
-                // Replace old URLs by new ones
-                if (corePreferences.checkForUpdateServerUrl == "https://www.linphone.org/releases") {
-                    corePreferences.checkForUpdateServerUrl = "https://download.linphone.org/releases"
-                }
-                if (core.fileTransferServer == "https://www.linphone.org:444/lft.php") {
-                    core.fileTransferServer = "https://files.linphone.org/http-file-transfer-server/hft.php"
-                }
-                if (core.logCollectionUploadServerUrl == "https://www.linphone.org:444/lft.php") {
-                    core.logCollectionUploadServerUrl = "https://files.linphone.org/http-file-transfer-server/hft.php"
-                }
-
-                // Set IMDN threshold to 1
-                core.imdnToEverybodyThreshold = 1
-
-                Log.i("$TAG Removing previous grammar files (without .belr extension)")
-                corePreferences.clearPreviousGrammars()
+                configurationMigration5To6()
             }
 
             corePreferences.linphoneConfigurationVersion = currentVersion
             Log.w(
                 "$TAG Core configuration updated to version [${corePreferences.linphoneConfigurationVersion}]"
             )
+        } else {
+            Log.i("$TAG No configuration migration required")
         }
 
         if (corePreferences.keepServiceAlive) {
@@ -908,4 +866,64 @@ class CoreContext
     fun enableLogcat(enable: Boolean) {
         logcatEnabled = enable
     }
+
+    @WorkerThread
+    private fun configurationMigration5To6() {
+        val policy = core.videoActivationPolicy.clone()
+        policy.automaticallyInitiate = false
+        policy.automaticallyAccept = true
+        policy.automaticallyAcceptDirection = MediaDirection.RecvOnly
+        core.videoActivationPolicy = policy
+        Log.i(
+            "$TAG Updated video activation policy to disable auto initiate, enable auto accept with media direction RecvOnly"
+        )
+
+        core.isFecEnabled = true
+        Log.i("$TAG Video FEC has been enabled")
+
+        core.config.setBool("magic_search", "return_empty_friends", true)
+        Log.i("$TAG Showing 'empty' friends enabled")
+
+        if (LinphoneUtils.getDefaultAccount()?.params?.domain == corePreferences.defaultDomain) {
+            corePreferences.contactsFilter = corePreferences.defaultDomain
+            Log.i(
+                "$TAG Setting default contacts list filter to [${corePreferences.contactsFilter}]"
+            )
+        }
+
+        for (account in core.accountList) {
+            val params = account.params
+            if (params.domain == corePreferences.defaultDomain && params.limeAlgo.isNullOrEmpty()) {
+                val clone = params.clone()
+                clone.limeAlgo = "c25519"
+                Log.i("$TAG Updating account [${params.identityAddress?.asStringUriOnly()}] params to use LIME algo c25519")
+                account.params = clone
+            }
+        }
+
+        Log.i("$TAG Making sure both RFC2833 & SIP INFO are enabled for DTMFs")
+        core.useRfc2833ForDtmf = true
+        core.useInfoForDtmf = true
+
+        // Add that flag back, was disabled for a time during dev process
+        Log.i("$TAG Enabling hiding empty chat rooms")
+        core.config.setBool("misc", "hide_empty_chat_rooms", true)
+
+        // Replace old URLs by new ones
+        if (corePreferences.checkForUpdateServerUrl == "https://www.linphone.org/releases") {
+            corePreferences.checkForUpdateServerUrl = "https://download.linphone.org/releases"
+        }
+        if (core.fileTransferServer == "https://www.linphone.org:444/lft.php") {
+            core.fileTransferServer = "https://files.linphone.org/http-file-transfer-server/hft.php"
+        }
+        if (core.logCollectionUploadServerUrl == "https://www.linphone.org:444/lft.php") {
+            core.logCollectionUploadServerUrl = "https://files.linphone.org/http-file-transfer-server/hft.php"
+        }
+
+        Log.i("$TAG IMDN threshold set to 1 (meaning only sender will receive delivery & read notifications)")
+        core.imdnToEverybodyThreshold = 1
+
+        Log.i("$TAG Removing previous grammar files (without .belr extension)")
+        corePreferences.clearPreviousGrammars()
+    }
 }