diff --git a/Classes/DialerView.m b/Classes/DialerView.m
index 500c00ead..ca5b224f1 100644
--- a/Classes/DialerView.m
+++ b/Classes/DialerView.m
@@ -145,9 +145,17 @@ static UICompositeViewDescription *compositeDescription = nil;
 			[_videoCameraSwitch setHidden:FALSE];
 		}
 	}
-	[_addContactButton setImage:[UIImage imageNamed:@"voip_conference_new"] forState:UIControlStateNormal];
-	_addContactButton.imageView.contentMode = UIViewContentModeScaleAspectFit;
-	_addContactButton.enabled = true;
+	
+	LinphoneAccount *defaultAccount = linphone_core_get_default_account(LC);
+	if (!(defaultAccount && linphone_account_params_get_conference_factory_uri(linphone_account_get_params(defaultAccount)))){
+		[_addContactButton setImage:[UIImage imageNamed:@"contact_add_default"] forState:UIControlStateNormal];
+		_addContactButton.imageView.contentMode = UIViewContentModeScaleAspectFit;
+		_addContactButton.enabled = true;
+	}else{
+		[_addContactButton setImage:[UIImage imageNamed:@"voip_conference_new"] forState:UIControlStateNormal];
+		_addContactButton.imageView.contentMode = UIViewContentModeScaleAspectFit;
+		_addContactButton.enabled = true;
+	}
 }
 
 - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
@@ -393,9 +401,17 @@ static UICompositeViewDescription *compositeDescription = nil;
 #pragma mark - Action Functions
 
 - (IBAction)onAddContactClick:(id)event {
-	ConferenceSchedulingView *view = VIEW(ConferenceSchedulingView);
-	[view resetViewModel];
-	[PhoneMainView.instance changeCurrentView:ConferenceSchedulingView.compositeViewDescription];
+	LinphoneAccount *defaultAccount = linphone_core_get_default_account(LC);
+	if (!(defaultAccount && linphone_account_params_get_conference_factory_uri(linphone_account_get_params(defaultAccount)))){
+		[ContactSelection setSelectionMode:ContactSelectionModeEdit];
+		[ContactSelection setAddAddress:[_addressField text]];
+		[ContactSelection enableSipFilter:FALSE];
+		[PhoneMainView.instance changeCurrentView:ContactsListView.compositeViewDescription];
+	}else{
+		ConferenceSchedulingView *view = VIEW(ConferenceSchedulingView);
+		[view resetViewModel];
+		[PhoneMainView.instance changeCurrentView:ConferenceSchedulingView.compositeViewDescription];
+	}
 }
 
 - (IBAction)onBackClick:(id)event {
@@ -406,6 +422,17 @@ static UICompositeViewDescription *compositeDescription = nil;
 	if ([self displayDebugPopup:_addressField.text]) {
 		_addressField.text = @"";
 	}
+	LinphoneAccount *defaultAccount = linphone_core_get_default_account(LC);
+	if (!(defaultAccount && linphone_account_params_get_conference_factory_uri(linphone_account_get_params(defaultAccount)))){
+		[_addContactButton setImage:[UIImage imageNamed:@"contact_add_default"] forState:UIControlStateNormal];
+		_addContactButton.enabled = ([[_addressField text] length] > 0);
+		if ([_addressField.text length] == 0) {
+			[self.view endEditing:YES];
+		}
+	}else{
+		[_addContactButton setImage:[UIImage imageNamed:@"voip_conference_new"] forState:UIControlStateNormal];
+		_addContactButton.enabled = true;
+	}
 }
 
 - (IBAction)onBackspaceClick:(id)sender {
diff --git a/Resources/assistant_external_sip.rc b/Resources/assistant_external_sip.rc
index 4f6b2f2ea..46d2f70a3 100644
--- a/Resources/assistant_external_sip.rc
+++ b/Resources/assistant_external_sip.rc
@@ -14,6 +14,9 @@
 		<entry name="rtp_bundle" overwrite="true">0</entry>
 		<entry name="push_notification_allowed" overwrite="true">0</entry>
 		<entry name="remote_push_notification_allowed" overwrite="true">0</entry>
+		<entry name="conference_factory_uri" overwrite="true"></entry>
+		<entry name="audio_video_conference_factory_uri" overwrite="true"></entry>
+		<entry name="cpim_in_basic_chat_rooms_enabled" overwrite="true">0</entry>
 	</section>
 
 
@@ -31,4 +34,7 @@
 		<entry name="username_min_length" overwrite="true">1</entry>
 		<entry name="username_regex" overwrite="true">.*</entry>
 	</section>
+	<section name="lime">
+		<entry name="lime_server_url" overwrite="true"></entry>
+	</section>
 </config>
diff --git a/Resources/assistant_linphone_existing.rc b/Resources/assistant_linphone_existing.rc
index 08abd1341..03aa98edf 100644
--- a/Resources/assistant_linphone_existing.rc
+++ b/Resources/assistant_linphone_existing.rc
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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="true">1</entry>
 		<entry name="dial_escape_plus" overwrite="true">0</entry>
@@ -19,18 +18,16 @@
 		<entry name="rtp_bundle" overwrite="true">1</entry>
 		<entry name="conference_factory_uri" overwrite="true">sip:conference-factory@sip.linphone.org</entry>
 		<entry name="audio_video_conference_factory_uri" overwrite="true">sip:videoconference-factory@sip.linphone.org</entry>
+		<entry name="cpim_in_basic_chat_rooms_enabled" overwrite="true">1</entry>
 	</section>
-
 	<section name="nat_policy_default_values">
 		<entry name="stun_server" overwrite="true">stun.linphone.org</entry>
 		<entry name="protocols" overwrite="true">stun,ice</entry>
 	</section>
-
 	<section name="sip">
 		<entry name="rls_uri" overwrite="true">sips:rls@sip.linphone.org</entry>
 		<entry name="auto_net_state_mon" overwrite="true">1</entry>
 	</section>
-	
 	<section name="assistant">
 		<entry name="domain" overwrite="true">sip.linphone.org</entry>
 		<entry name="password_max_length" overwrite="true">34</entry>