diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 8644451dd..eda755873 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -423,7 +423,7 @@ static void linphone_iphone_transfer_state_changed(LinphoneCore* lc, LinphoneCal
 
 #pragma mark - Registration State Functions
 
--(void) onRegister:(LinphoneCore *)lc cfg:(LinphoneProxyConfig*) cfg state:(LinphoneRegistrationState) state message:(const char*) message {
+- (void)onRegister:(LinphoneCore *)lc cfg:(LinphoneProxyConfig*) cfg state:(LinphoneRegistrationState) state message:(const char*) message {
     [LinphoneLogger logc:LinphoneLoggerLog format:"NEW REGISTRATION STATE: '%s' (message: '%s')", linphone_registration_state_to_string(state), message];
 	if (state==LinphoneRegistrationOk)
 		[LinphoneManager instance]->stopWaitingRegisters=TRUE;
diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m
index 7aeb28c8b..488df4e09 100644
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@@ -283,12 +283,15 @@ static PhoneMainView* phoneMainViewInstance=nil;
     LinphoneProxyConfig *cfg = [[notif.userInfo objectForKey: @"cfg"] pointerValue];
     // Show error
     if (state == LinphoneRegistrationFailed) {
-		NSString* lErrorMessage=nil;
-		if (linphone_proxy_config_get_error(cfg) == LinphoneReasonBadCredentials) {
-			lErrorMessage = NSLocalizedString(@"Bad credentials, check your account settings",nil);
-		} else if (linphone_proxy_config_get_error(cfg) == LinphoneReasonNoResponse) {
-			lErrorMessage = NSLocalizedString(@"SIP server unreachable",nil);
-		} 
+		NSString* lErrorMessage = nil;
+        LinphoneReason reason = linphone_proxy_config_get_error(cfg);
+		if (reason == LinphoneReasonBadCredentials) {
+			lErrorMessage = NSLocalizedString(@"Bad credentials, check your account settings", nil);
+		} else if (reason == LinphoneReasonNoResponse) {
+			lErrorMessage = NSLocalizedString(@"SIP server unreachable", nil);
+		} else {
+            lErrorMessage = NSLocalizedString(@"Unknown error", nil);
+        }
 		
 		if (lErrorMessage != nil && linphone_proxy_config_get_error(cfg) != LinphoneReasonNoResponse) { 
             //do not report network connection issue on registration
diff --git a/Classes/WizardViewController.m b/Classes/WizardViewController.m
index 408abb40a..4daec30f4 100644
--- a/Classes/WizardViewController.m
+++ b/Classes/WizardViewController.m
@@ -351,6 +351,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 }
 
 - (void)addProxyConfig:(NSString*)username password:(NSString*)password domain:(NSString*)domain server:(NSString*)server {
+    [self clearProxyConfig];
     if(server == nil) {
         server = domain;
     }
@@ -777,8 +778,10 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch {
     if ([touch.view isKindOfClass:[UIButton class]]) { //Avoid tap gesture on Button
-        [LinphoneUtils findAndResignFirstResponder:currentView];
-        return NO;
+        if([LinphoneUtils findAndResignFirstResponder:currentView]) {
+            [(UIButton*)touch.view sendActionsForControlEvents:UIControlEventTouchUpInside];
+            return NO;
+        }
     }
     return YES;
 }
diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings
index 03cca0ed3..e2f6b267d 100644
Binary files a/Resources/en.lproj/Localizable.strings and b/Resources/en.lproj/Localizable.strings differ
diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings
index 93ea9abbb..196affc93 100644
Binary files a/Resources/fr.lproj/Localizable.strings and b/Resources/fr.lproj/Localizable.strings differ
diff --git a/linphone-Info.plist b/linphone-Info.plist
index 0571fa27c..6ffe2f7d5 100644
--- a/linphone-Info.plist
+++ b/linphone-Info.plist
@@ -47,7 +47,7 @@
 	<array>
 		<dict>
 			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
+			<string>Viewer</string>
 			<key>CFBundleURLIconFile</key>
 			<string>linphone_icon_72@2x</string>
 			<key>CFBundleURLName</key>
diff --git a/linphone.ldb/Contents.plist b/linphone.ldb/Contents.plist
index a1bb4d322..fe24368da 100644
--- a/linphone.ldb/Contents.plist
+++ b/linphone.ldb/Contents.plist
@@ -11997,7 +11997,7 @@
 						</dict>
 					</dict>
 					<key>change date</key>
-					<date>2012-09-28T08:39:17Z</date>
+					<date>2012-09-28T09:53:17Z</date>
 					<key>changed values</key>
 					<array/>
 					<key>class</key>
@@ -12007,7 +12007,7 @@
 					<key>flags</key>
 					<integer>0</integer>
 					<key>hash</key>
-					<string>974d882db652398dc5678a38298fec69
+					<string>301ca0dd125a814aec815b3dce0b61e4
 </string>
 					<key>name</key>
 					<string>Localizable.strings</string>
@@ -14226,6 +14226,31 @@ La cause était: %2$@</string>
 							<key>snapshots</key>
 							<dict/>
 						</dict>
+						<dict>
+							<key>change date</key>
+							<date>2001-01-01T00:00:00Z</date>
+							<key>changed values</key>
+							<array/>
+							<key>class</key>
+							<string>BLStringKeyObject</string>
+							<key>comment</key>
+							<string>No comment provided by engineer.</string>
+							<key>errors</key>
+							<array/>
+							<key>flags</key>
+							<integer>0</integer>
+							<key>key</key>
+							<string>Unknown error</string>
+							<key>localizations</key>
+							<dict>
+								<key>en</key>
+								<string>Unknown error</string>
+								<key>fr</key>
+								<string>Erreur inconnue</string>
+							</dict>
+							<key>snapshots</key>
+							<dict/>
+						</dict>
 						<dict>
 							<key>change date</key>
 							<date>2001-01-01T00:00:00Z</date>
diff --git a/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings b/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
index 03cca0ed3..e2f6b267d 100644
Binary files a/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings and b/linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings differ