diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m
index 22a5f84f4..ae113d442 100644
--- a/Classes/LinphoneCoreSettingsStore.m
+++ b/Classes/LinphoneCoreSettingsStore.m
@@ -505,7 +505,18 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 		linphone_proxy_config_set_expires(proxyCfg, expire);
 
 		LinphoneAuthInfo *proxyAi = (LinphoneAuthInfo *)linphone_proxy_config_find_auth_info(proxyCfg);
-		// setup auth info
+
+		// setup new proxycfg
+		if (isEditing) {
+			linphone_proxy_config_done(proxyCfg);
+		} else {
+			// was a new proxy config, add it
+			linphone_core_add_proxy_config(lc, proxyCfg);
+			linphone_core_set_default_proxy_config(lc, proxyCfg);
+		}
+
+		// modify auth info only after finishing editting the proxy config, so that
+		// UNREGISTER succeed
 		if (proxyAi) {
 			linphone_auth_info_set_username(proxyAi, username.UTF8String);
 			if (password) {
@@ -526,15 +537,6 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 			}
 		}
 
-		// setup new proxycfg
-		if (isEditing) {
-			linphone_proxy_config_done(proxyCfg);
-		} else {
-			// was a new proxy config, add it
-			linphone_core_add_proxy_config(lc, proxyCfg);
-			linphone_core_set_default_proxy_config(lc, proxyCfg);
-		}
-
 	bad_proxy:
 		if (linphoneAddress)
 			linphone_address_destroy(linphoneAddress);
diff --git a/submodules/belle-sip b/submodules/belle-sip
index 9b72b22e8..59d40bdb8 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit 9b72b22e81db1aeb2782413648dbcde5d41d8067
+Subproject commit 59d40bdb82fd7ea89b94e80e563771fbc7d41ada
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 535ffb9d9..f0eba1764 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 535ffb9d91b071f9272cb3bf71e4e4dacc57371a
+Subproject commit f0eba1764f2fa80e5bdb755aae32a65fdb3b2e4a
diff --git a/submodules/linphone b/submodules/linphone
index 7228158af..5d44564e1 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 7228158af0d723d642dbaa7e1c556dddb9cf78d7
+Subproject commit 5d44564e109c4780460ce83463d1ef6bf94712d2