diff --git a/app/src/main/java/org/linphone/assistant/AssistantActivity.java b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
index 00700191a..11158a1fb 100644
--- a/app/src/main/java/org/linphone/assistant/AssistantActivity.java
+++ b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
@@ -503,8 +503,7 @@ public class AssistantActivity extends Activity
 
     public void linphoneLogIn(AccountCreator accountCreator) {
         LinphoneManager.getLc()
-                .getConfig()
-                .loadFromXmlFile(LinphoneManager.getInstance().getmDynamicConfigFile());
+                .loadConfigFromXml(LinphoneManager.getInstance().getmDynamicConfigFile());
         configureProxyConfig(accountCreator);
     }
 
diff --git a/app/src/main/java/org/linphone/assistant/CreateAccountFragment.java b/app/src/main/java/org/linphone/assistant/CreateAccountFragment.java
index ab58548df..706ac5ef7 100644
--- a/app/src/main/java/org/linphone/assistant/CreateAccountFragment.java
+++ b/app/src/main/java/org/linphone/assistant/CreateAccountFragment.java
@@ -340,8 +340,8 @@ public class CreateAccountFragment extends Fragment
                 if (mUseEmail.isChecked()) mAccountCreator.setPhoneNumber(null, null);
                 if (!getResources().getBoolean(R.bool.isTablet) || getUsername().length() > 0) {
                     LinphoneManager.getLc()
-                            .getConfig()
-                            .loadFromXmlFile(LinphoneManager.getInstance().getmDynamicConfigFile());
+                            .loadConfigFromXml(
+                                    LinphoneManager.getInstance().getmDynamicConfigFile());
                     mAccountCreator.isAccountExist();
                 } else {
                     LinphoneUtils.displayErrorAlert(
@@ -674,8 +674,7 @@ public class CreateAccountFragment extends Fragment
                         LinphoneUtils.errorForStatus(status), AssistantActivity.instance());
             } else {
                 LinphoneManager.getLc()
-                        .getConfig()
-                        .loadFromXmlFile(LinphoneManager.getInstance().getmDynamicConfigFile());
+                        .loadConfigFromXml(LinphoneManager.getInstance().getmDynamicConfigFile());
                 accountCreator.isAliasUsed();
             }
         } else {
diff --git a/app/src/main/java/org/linphone/assistant/LinphoneLoginFragment.java b/app/src/main/java/org/linphone/assistant/LinphoneLoginFragment.java
index 6c7dde9bc..6694c352b 100644
--- a/app/src/main/java/org/linphone/assistant/LinphoneLoginFragment.java
+++ b/app/src/main/java/org/linphone/assistant/LinphoneLoginFragment.java
@@ -277,8 +277,7 @@ public class LinphoneLoginFragment extends Fragment
             boolean isOk = status == AccountCreator.PhoneNumberStatus.Ok.toInt();
             if (isOk) {
                 LinphoneManager.getLc()
-                        .getConfig()
-                        .loadFromXmlFile(LinphoneManager.getInstance().getmDynamicConfigFile());
+                        .loadConfigFromXml(LinphoneManager.getInstance().getmDynamicConfigFile());
                 mAccountCreator.isAliasUsed();
             } else {
                 mApply.setEnabled(true);
diff --git a/app/src/main/res/raw/assistant_create.rc b/app/src/main/res/raw/assistant_create.rc
index 2fa47358c..73ff20142 100644
--- a/app/src/main/res/raw/assistant_create.rc
+++ b/app/src/main/res/raw/assistant_create.rc
@@ -32,4 +32,7 @@
     <entry name="username_min_length" overwrite="true">1</entry>
     <entry name="username_regex" overwrite="true">^[a-z0-9+_.\-]*$</entry>
   </section>
+  <section name="lime">
+    <entry name="x3dh_server_url" overwrite="true">http://sip-staging.linphone.org:8083/flexisip-account-manager/x3dh-25519.php</entry>
+  </section>
 </config>
diff --git a/app/src/main/res/raw/linphonerc_factory b/app/src/main/res/raw/linphonerc_factory
index f3e20d5fd..aea7298e8 100644
--- a/app/src/main/res/raw/linphonerc_factory
+++ b/app/src/main/res/raw/linphonerc_factory
@@ -15,23 +15,9 @@ register_only_when_network_is_up=1
 auto_net_state_mon=1
 auto_answer_replacing_calls=1
 ping_with_options=0
-rls_uri=
 use_cpim=1
-linphone_specs=groupchat,lime
-
-[rtp]
-audio_rtp_port=7076
-video_rtp_port=9078
-audio_jitt_comp=60
-video_jitt_comp=60
-nortp_timeout=30
-disable_upnp=1
 
 [sound]
-playback_dev_id=
-ringer_dev_id=
-capture_dev_id=
-dtmf_player_amp=0.1
 #remove this property for any application that is not Linphone public version itself
 ec_calibrator_cool_tones=1
 
@@ -56,19 +42,4 @@ server_url=https://subscribe.linphone.org:444/inapp.php
 purchasable_items_ids=test_account_subscription
 
 [assistant]
-domain=sip.linphone.org
-password_max_length=-1
-password_min_length=1
-username_length=-1
-username_max_length=64
-username_min_length=1
-username_regex=^[a-z0-9_.\-]*$
 xmlrpc_url=https://subscribe.linphone.org:444/wizard.php
-
-[lime]
-lime_v2=1
-x3dh_server_url=http://sip-staging.linphone.org:8083/flexisip-account-manager/x3dh-25519.php
-lime_update_threshold=86400
-max_nb_device_per_participant=255
-allow_message_in_unsafe_chatroom=1
-unsafe_if_sas_refused=1