diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m
index 0cfcf331a..800e9fc69 100644
--- a/Classes/AssistantView.m
+++ b/Classes/AssistantView.m
@@ -859,7 +859,11 @@ static UICompositeViewDescription *compositeDescription = nil;
 			_outgoingView = AssistantLinkView.compositeViewDescription;
 			[self configureProxyConfig];
 		} else {
-			[self showErrorPopup:resp];
+			if (linphone_account_creator_get_username(account_creator) && strcmp(resp, "ERROR_ACCOUNT_DOESNT_EXIST")) {
+				[self showErrorPopup:"ERROR_BAD_CREDENTIALS"];
+			} else {
+				[self showErrorPopup:resp];
+			}
 		}
 	} else {
 		if (status == LinphoneAccountCreatorAccountExist || status == LinphoneAccountCreatorAccountExistWithAlias) {
diff --git a/Classes/LinphoneUI/StatusBarView.m b/Classes/LinphoneUI/StatusBarView.m
index a4556e5af..86975f227 100644
--- a/Classes/LinphoneUI/StatusBarView.m
+++ b/Classes/LinphoneUI/StatusBarView.m
@@ -182,8 +182,8 @@
 	LinphoneRegistrationState state = LinphoneRegistrationNone;
 	NSString *message = nil;
 	LinphoneGlobalState gstate = linphone_core_get_global_state(LC);
-
-	if ([PhoneMainView.instance.currentView equal:AssistantView.compositeViewDescription]) {
+	
+	if ([PhoneMainView.instance.currentView equal:AssistantView.compositeViewDescription] || [PhoneMainView.instance.currentView equal:CountryListView.compositeViewDescription]) {
 		message = NSLocalizedString(@"Configuring account", nil);
 	} else if (gstate == LinphoneGlobalOn && !linphone_core_is_network_reachable(LC)) {
 		message = NSLocalizedString(@"Network down", nil);