diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m
index c6de9f3a7..f195c2d18 100644
--- a/Classes/AssistantView.m
+++ b/Classes/AssistantView.m
@@ -173,7 +173,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	
 }
 - (void)loadAssistantConfig:(NSString *)rcFilename {
-	linphone_config_load_from_xml_file(linphone_core_get_config(LC),
+	linphone_core_load_config_from_xml(LC,
 									   [LinphoneManager bundleFile:rcFilename].UTF8String);
 	[self changeView:nextView back:FALSE animation:TRUE];
 }
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index b93b82f68..df2f23107 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -331,6 +331,7 @@ struct codec_name_pref_table codec_pref_table[] = {{"speex", 8000, "speex_8k_pre
 - (void)migrationAllPost {
 	[self migrationLinphoneSettings];
 	[self migratePushNotificationPerAccount];
+	[self migrateLimeSettings];
 }
 
 - (void)migrationAllPre {
@@ -475,6 +476,20 @@ static void migrateWizardToAssistant(const char *entry, void *user_data) {
 	}
 }
 
+- (void)migrateLimeSettings {
+	if ([self lpConfigBoolForKey:@"lime_migration_done"] == FALSE) {
+		const MSList *proxies = linphone_core_get_proxy_config_list(LC);
+		while (proxies) {
+			if (!strcmp(linphone_proxy_config_get_domain((LinphoneProxyConfig *)proxies->data),"sip.linphone.org")) {
+				linphone_core_set_lime_x3dh_server_url(LC, "https://lime.linphone.org/lime-server/lime-server.php");
+				break;
+			}
+			proxies = proxies->next;
+		}
+		[self lpConfigSetBool:TRUE forKey:@"lime_migration_done"];
+	}
+}
+
 #pragma mark - Linphone Core Functions
 
 + (LinphoneCore *)getLc {
diff --git a/Resources/assistant_linphone_create.rc b/Resources/assistant_linphone_create.rc
index ff9143579..ab962dde8 100644
--- a/Resources/assistant_linphone_create.rc
+++ b/Resources/assistant_linphone_create.rc
@@ -36,4 +36,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="lime_server_url" overwrite="true">https://lime.linphone.org/lime-server/lime-server.php</entry>
+	</section>
 </config>
diff --git a/Resources/assistant_linphone_existing.rc b/Resources/assistant_linphone_existing.rc
index b0e2068dc..c427675e8 100644
--- a/Resources/assistant_linphone_existing.rc
+++ b/Resources/assistant_linphone_existing.rc
@@ -37,4 +37,7 @@
 		<entry name="username_regex" overwrite="true">^[a-z0-9+_.\-]*$</entry>
 		<entry name="xmlrpc_url" overwrite="true">https://subscribe.linphone.org:444/wizard.php</entry>
 	</section>
+	<section name="lime">
+		<entry name="lime_server_url" overwrite="true">https://lime.linphone.org/lime-server/lime-server.php</entry>
+	</section>
 </config>
diff --git a/Resources/linphonerc b/Resources/linphonerc
index a034a1f65..c375bc6bb 100644
--- a/Resources/linphonerc
+++ b/Resources/linphonerc
@@ -15,6 +15,7 @@ voiceproc_preference=1
 repeat_call_notification=1
 display_phone_only=0
 auto_download_incoming_files_max_size=0
+lime_migration_done=0
 
 [in_app_purchase]
 #set to 1 if in-app purchases are to be shown in the application
diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory
index 96e65e96e..383f76700 100644
--- a/Resources/linphonerc-factory
+++ b/Resources/linphonerc-factory
@@ -58,11 +58,3 @@ ringer_dev_id=AQ: Audio Queue Device
 [video]
 display_filter_auto_rotate=0
 
-[lime]
-lime_v2=1
-lime_server_url=https://lime.linphone.org/lime-server/lime-server.php
-lime_update_threshold=86400
-#lime_update_threshold=30
-max_nb_device_per_participant=255
-allow_message_in_unsafe_chatroom=1
-unsafe_if_sas_refused=0