diff --git a/Classes/Base.lproj/WizardViews.xib b/Classes/Base.lproj/WizardViews.xib
index 9c30bd9cd..23900ba39 100644
--- a/Classes/Base.lproj/WizardViews.xib
+++ b/Classes/Base.lproj/WizardViews.xib
@@ -469,7 +469,7 @@
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
             <point key="canvasLocation" x="927" y="912"/>
         </view>
-        <view tag="176" contentMode="scaleToFill" id="101" userLabel="validateAccountView">
+        <view contentMode="scaleToFill" id="101" userLabel="validateAccountView">
             <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m
index 097b1ea4a..6747a85e0 100644
--- a/Classes/LinphoneCoreSettingsStore.m
+++ b/Classes/LinphoneCoreSettingsStore.m
@@ -431,9 +431,6 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 			proxy = linphone_address_as_string_uri_only(proxy_addr);
 		}
 
-		// use proxy as route if outbound_proxy is enabled
-		route = isOutboundProxy ? proxy : NULL;
-
 		// possible valid config detected, try to modify current proxy or create new one if none existing
 		linphone_core_get_default_proxy(lc, &proxyCfg);
 		if (proxyCfg == NULL) {
@@ -459,6 +456,8 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
 			error = NSLocalizedString(@"Invalid username or domain", nil);
 			goto bad_proxy;
 		}
+		// use proxy as route if outbound_proxy is enabled
+		route = isOutboundProxy ? proxy : NULL;
 		if (linphone_proxy_config_set_server_addr(proxyCfg, proxy) == -1) {
 			error = NSLocalizedString(@"Invalid proxy address", nil);
 			goto bad_proxy;
diff --git a/Resources/wizard_linphone_create.rc b/Resources/wizard_linphone_create.rc
index ee15a41e5..722040d06 100644
--- a/Resources/wizard_linphone_create.rc
+++ b/Resources/wizard_linphone_create.rc
@@ -3,7 +3,6 @@
 
 	<section name="proxy_default_values">
 		<entry name="reg_proxy" overwrite="true">&lt;sip:sip.linphone.org;transport=tls&gt;</entry>
-		<entry name="reg_route" overwrite="true">&lt;sip:sip.linphone.org;transport=tls&gt;</entry>
 		<entry name="reg_identity" overwrite="true">sip:?@sip.linphone.org</entry>
 		<entry name="reg_expires" overwrite="true">1314000</entry>
 		<entry name="reg_sendregister" overwrite="true">1</entry>
diff --git a/Resources/wizard_linphone_existing.rc b/Resources/wizard_linphone_existing.rc
index 7977a0d9f..3822706d2 100644
--- a/Resources/wizard_linphone_existing.rc
+++ b/Resources/wizard_linphone_existing.rc
@@ -3,7 +3,6 @@
 
 	<section name="proxy_default_values">
 		<entry name="reg_proxy" overwrite="true">&lt;sip:sip.linphone.org;transport=tls&gt;</entry>
-		<entry name="reg_route" overwrite="true">&lt;sip:sip.linphone.org;transport=tls&gt;</entry>
 		<entry name="reg_identity" overwrite="true">sip:?@sip.linphone.org</entry>
 		<entry name="reg_expires" overwrite="true">1314000</entry>
 		<entry name="reg_sendregister" overwrite="true">1</entry>
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index ab2085a67..9bc38915e 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -3963,7 +3963,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "test -f liblinphone-sdk/apple-darwin/share/linphone/rootca.pem || (echo 'liblinphone SDK not found. Please refer to the README but you need to compile liblinphone SDK before building Linphone application' && exit 1)";
+			shellScript = "test -f liblinphone-sdk/apple-darwin/share/linphone/rootca.pem || (echo 'liblinphone SDK not found. Please refer to the README: you have to compile liblinphone SDK before building Linphone application.' && exit 1)";
 		};
 		D33CF34715D3985000CD4B85 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;