diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m
index ff7977102..4807623ef 100644
--- a/Classes/AssistantView.m
+++ b/Classes/AssistantView.m
@@ -174,6 +174,13 @@ static UICompositeViewDescription *compositeDescription = nil;
 - (void)loadAssistantConfig:(NSString *)rcFilename {
 	linphone_core_load_config_from_xml(LC,
 									   [LinphoneManager bundleFile:rcFilename].UTF8String);
+	if (account_creator) {
+		// Below two settings are applied to account creator when it is built.
+		// Reloading Core config after won't change the account creator configuration,
+		// hence the manual reload
+		linphone_account_creator_set_domain(account_creator, [[LinphoneManager.instance lpConfigStringForKey:@"domain" inSection:@"assistant" withDefault:@""] UTF8String]);
+		linphone_account_creator_set_algorithm(account_creator, [[LinphoneManager.instance lpConfigStringForKey:@"algorithm" inSection:@"assistant" withDefault:@""] UTF8String]);
+	}
 	[self changeView:nextView back:FALSE animation:TRUE];
 }
 
diff --git a/Resources/assistant_external_sip.rc b/Resources/assistant_external_sip.rc
index 2d9e28cf6..dd3090139 100644
--- a/Resources/assistant_external_sip.rc
+++ b/Resources/assistant_external_sip.rc
@@ -21,7 +21,6 @@
 
 	<section name="assistant">
 		<entry name="domain" overwrite="true"></entry>
-		<entry name="algorithm" overwrite="true">SHA-256</entry>
 		<entry name="password_max_length" overwrite="true">-1</entry>
 		<entry name="password_min_length" overwrite="true">-1</entry>
 		<entry name="username_length" overwrite="true">-1</entry>