diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m
index 0b6c3b05f..b177f984c 100644
--- a/Classes/AssistantView.m
+++ b/Classes/AssistantView.m
@@ -224,6 +224,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 		case LinphoneAccountCreatorPhoneNumberNotUsed:
 		case LinphoneAccountCreatorPhoneNumberUsedAlias:
 		case LinphoneAccountCreatorPhoneNumberUsedAccount:
+		case LinphoneAccountCreatorErrorServer:
 		case LinphoneAccountCreatorOK:
 			break;
 	}
diff --git a/Classes/FirstLoginView.m b/Classes/FirstLoginView.m
index 28ac4caae..746981c44 100644
--- a/Classes/FirstLoginView.m
+++ b/Classes/FirstLoginView.m
@@ -167,6 +167,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 		case LinphoneAccountCreatorPhoneNumberNotUsed:
 		case LinphoneAccountCreatorPhoneNumberUsedAlias:
 		case LinphoneAccountCreatorPhoneNumberUsedAccount:
+		case LinphoneAccountCreatorErrorServer:
 		case LinphoneAccountCreatorOK:
 			break;
 	}
diff --git a/Classes/LinphoneUI/UIContactCell.m b/Classes/LinphoneUI/UIContactCell.m
index 3a6996350..5235db8af 100644
--- a/Classes/LinphoneUI/UIContactCell.m
+++ b/Classes/LinphoneUI/UIContactCell.m
@@ -75,7 +75,8 @@
 	_contact = acontact;
 	if(_contact) {
 		[ContactDisplay setDisplayNameLabel:_nameLabel forContact:_contact];
-		_linphoneImage.hidden = ! ((_contact.friend && linphone_presence_model_get_basic_status(linphone_friend_get_presence_model(_contact.friend)) == LinphonePresenceBasicStatusOpen) || [FastAddressBook contactHasValidSipDomain:_contact]);
+		_linphoneImage.hidden =
+			! ((_contact.friend && linphone_presence_model_get_basic_status(linphone_friend_get_presence_model(_contact.friend)) == LinphonePresenceBasicStatusOpen) || [FastAddressBook contactHasValidSipDomain:_contact]);
 	}
 }
 
diff --git a/submodules/linphone b/submodules/linphone
index 8958eaa2b..a56c6bb51 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 8958eaa2b51b1203d406009495774b56d20d5f83
+Subproject commit a56c6bb514eaf40876ea2d98ea16f23e608a48c5