diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 5099e1c8c..5feb271a0 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -313,10 +313,9 @@ struct codec_name_pref_table codec_pref_table[] = {{"speex", 8000, "speex_8k_pre
 						 forKey:@"xmlrpc_url"
 					  inSection:@"assistant"];
 		[self lpConfigSetString:@"sip:rls@sip.linphone.org" forKey:@"rls_uri" inSection:@"sip"];
-		[self lpConfigSetBool:YES forKey:@"use_rls_presence" inSection:@"sip"];
 		[self lpConfigSetBool:YES forKey:@"migration_xmlrpc"];
 	}
-	[self lpConfigSetBool:NO forKey:@"store_friends" inSection:@"misc"]; //so far, storing friends in files is not needed. may change in the futur.
+	[self lpConfigSetBool:NO forKey:@"store_friends" inSection:@"misc"]; //so far, storing friends in files is not needed. may change in the future.
 }
 
 static int check_should_migrate_images(void *data, int argc, char **argv, char **cnames) {
diff --git a/Resources/assistant_external_sip.rc b/Resources/assistant_external_sip.rc
index 3043424cd..9512fbbff 100644
--- a/Resources/assistant_external_sip.rc
+++ b/Resources/assistant_external_sip.rc
@@ -16,7 +16,6 @@
 
 	<section name="sip">
 		<entry name="rls_uri" overwrite="true"></entry>
-		<entry name="use_rls_presence" overwrite="true"></entry>
 	</section>
 
 	<section name="assistant">
diff --git a/Resources/assistant_linphone_existing.rc b/Resources/assistant_linphone_existing.rc
index 98a95e9f5..7aa99628f 100644
--- a/Resources/assistant_linphone_existing.rc
+++ b/Resources/assistant_linphone_existing.rc
@@ -2,7 +2,7 @@
 <config xmlns="http://www.linphone.org/xsds/lpconfig.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.linphone.org/xsds/lpconfig.xsd lpconfig.xsd">
 
 	<section name="proxy_default_values">
-		<entry name="avpf" overwrite="t rue">1</entry>
+		<entry name="avpf" overwrite="true">1</entry>
 		<entry name="dial_escape_plus" overwrite="true">0</entry>
 		<entry name="publish" overwrite="true">0</entry>
 		<entry name="quality_reporting_collector" overwrite="true">sip:voip-metrics@sip.linphone.org;transport=tls</entry>
diff --git a/Resources/assistant_remote.rc b/Resources/assistant_remote.rc
index 6e0a8eb42..d108deb18 100644
--- a/Resources/assistant_remote.rc
+++ b/Resources/assistant_remote.rc
@@ -16,7 +16,6 @@
 
 	<section name="sip">
 		<entry name="rls_uri" overwrite="true"></entry>
-		<entry name="use_rls_presence" overwrite="true"></entry>
 	</section>
 
 	<section name="assistant">