diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 6930db643..a332440b7 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -892,7 +892,14 @@ static void linphone_iphone_popup_password_request(LinphoneCore *lc, const char
 												   const char *domain) {
 	// let the wizard handle its own errors
 	if ([PhoneMainView.instance currentView] != WizardViewController.compositeViewDescription) {
-		DTAlertView *alertView = [[DTAlertView alloc]
+		static DTAlertView *alertView = nil;
+
+		// avoid having multiple popups
+		if ([alertView isVisible]) {
+			[alertView dismissWithClickedButtonIndex:0 animated:NO];
+		}
+
+		alertView = [[DTAlertView alloc]
 			initWithTitle:NSLocalizedString(@"Authentication needed.", nil)
 				  message:[NSString stringWithFormat:NSLocalizedString(@"Registration failed because authentication is "
 																	   @"missing or invalid for %s@%s.\nYou can "
diff --git a/submodules/linphone b/submodules/linphone
index ee187d4cb..6bae96a3b 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit ee187d4cb5de19ae044ab72fe6a2438b0693dc25
+Subproject commit 6bae96a3bffd89ea9ece0d7aa550589214b7d319