diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m
index b177f984c..7f61eb63f 100644
--- a/Classes/AssistantView.m
+++ b/Classes/AssistantView.m
@@ -211,6 +211,8 @@ static UICompositeViewDescription *compositeDescription = nil;
 			return NSLocalizedString(@"Failed to query the server. Please try again later", nil);
 		case LinphoneAccountCreatorTransportNotSupported:
 			return NSLocalizedString(@"Unsupported transport", nil);
+		case LinphoneAccountCreatorErrorServer:
+			return NSLocalizedString(@"Server error", nil);
 		case LinphoneAccountCreatorAccountCreated:
 		case LinphoneAccountCreatorAccountExist:
 		case LinphoneAccountCreatorAccountExistWithAlias:
@@ -226,6 +228,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 		case LinphoneAccountCreatorPhoneNumberUsedAccount:
 		case LinphoneAccountCreatorErrorServer:
 		case LinphoneAccountCreatorOK:
+		
 			break;
 	}
 	return nil;
diff --git a/Classes/FirstLoginView.m b/Classes/FirstLoginView.m
index 746981c44..865a70aab 100644
--- a/Classes/FirstLoginView.m
+++ b/Classes/FirstLoginView.m
@@ -154,6 +154,8 @@ static UICompositeViewDescription *compositeDescription = nil;
 			return NSLocalizedString(@"Failed to query the server. Please try again later", nil);
 		case LinphoneAccountCreatorTransportNotSupported:
 			return NSLocalizedString(@"Unsupported transport", nil);
+		case LinphoneAccountCreatorErrorServer:
+			return NSLocalizedString(@"Server error", nil);
 		case LinphoneAccountCreatorAccountCreated:
 		case LinphoneAccountCreatorAccountExist:
 		case LinphoneAccountCreatorAccountExistWithAlias:
diff --git a/submodules/linphone b/submodules/linphone
index a56c6bb51..565f83f13 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit a56c6bb514eaf40876ea2d98ea16f23e608a48c5
+Subproject commit 565f83f13d731e5ed90fe1a466c5f21a55eb44ce