diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m
index 034391d80..7900581ce 100644
--- a/Classes/AssistantView.m
+++ b/Classes/AssistantView.m
@@ -229,6 +229,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 		case LinphoneAccountCreatorAccountNotCreated:
 		case LinphoneAccountCreatorAccountNotExist:
 		case LinphoneAccountCreatorAccountNotActivated:
+		case LinphoneAccountCreatorAccountAlreadyActivated:
 		case LinphoneAccountCreatorAccountActivated:
 		case LinphoneAccountCreatorOK:
 			break;
@@ -518,7 +519,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 							 UIAssistantTextField* countryCodeField = [self findTextField:ViewElement_PhoneCC];
 							 NSString* prefix = countryCodeField.text.length > 0 ? [countryCodeField.text substringFromIndex:1] : nil;
 							 LinphoneAccountCreatorStatus s =
-							 linphone_account_creator_set_phone_number(account_creator, inputEntry.UTF8String, prefix.UTF8String);
+							 linphone_account_creator_set_phone_number(account_creator, inputEntry.length > 0 ? inputEntry.UTF8String : NULL, prefix.UTF8String);
 							 if (s != LinphoneAccountCreatorOK) linphone_account_creator_set_phone_number(account_creator, NULL, NULL);
 							 createPhone.errorLabel.text = [AssistantView errorForStatus:s];
 							 return s != LinphoneAccountCreatorOK;
@@ -528,7 +529,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	[password showError:[AssistantView errorForStatus:LinphoneAccountCreatorPasswordTooShort]
 				   when:^BOOL(NSString *inputEntry) {
 					 LinphoneAccountCreatorStatus s =
-						 linphone_account_creator_set_password(account_creator, inputEntry.UTF8String);
+					   linphone_account_creator_set_password(account_creator, inputEntry.UTF8String);
 					 password.errorLabel.text = [AssistantView errorForStatus:s];
 					 return s != LinphoneAccountCreatorOK;
 				   }];
@@ -742,9 +743,11 @@ void assistant_activate_account(LinphoneAccountCreator *creator, LinphoneAccount
 								  cancelButtonTitle:NSLocalizedString(@"Continue", nil)
 								  otherButtonTitles:nil, nil];
 		[errorView show];
-	} else {
+	} else if (status == LinphoneAccountCreatorAccountAlreadyActivated) {
 		// in case we are actually trying to link account, let's try it now
 		linphone_account_creator_activate_phone_number_link(creator);
+	} else {
+		[thiz genericError];
 	}
 }
 
@@ -806,6 +809,11 @@ void assistant_activate_phone_number_link(LinphoneAccountCreator *creator, Linph
 
 #pragma mark - UITextFieldDelegate Functions
 
+- (void)textFieldDidBeginEditing:(UITextField *)textField {
+	UIAssistantTextField *atf = (UIAssistantTextField *)textField;
+	[atf textFieldDidBeginEditing:atf];
+}
+
 - (void)textFieldDidEndEditing:(UITextField *)textField {
 	UIAssistantTextField *atf = (UIAssistantTextField *)textField;
 	[atf textFieldDidEndEditing:atf];
@@ -816,11 +824,7 @@ void assistant_activate_phone_number_link(LinphoneAccountCreator *creator, Linph
 	UIAssistantTextField *atf = (UIAssistantTextField *)textField;
 	[textField resignFirstResponder];
 	if (textField.returnKeyType == UIReturnKeyNext) {
-		if (atf.nextResponder) {
-			[atf.nextResponder becomeFirstResponder];
-		} else {
-			[[self findButton:ViewElement_NextButton] sendActionsForControlEvents:UIControlEventTouchUpInside];
-		}
+		[atf.nextFieldResponder becomeFirstResponder];
 	} else if (textField.returnKeyType == UIReturnKeyDone) {
 		[[self findButton:ViewElement_NextButton] sendActionsForControlEvents:UIControlEventTouchUpInside];
 	}
diff --git a/Classes/Base.lproj/AssistantViewScreens.xib b/Classes/Base.lproj/AssistantViewScreens.xib
index b9c2746f0..4444096e6 100644
--- a/Classes/Base.lproj/AssistantViewScreens.xib
+++ b/Classes/Base.lproj/AssistantViewScreens.xib
@@ -168,6 +168,7 @@
                     <connections>
                         <action selector="onCountryCodeFieldChange:" destination="-1" eventType="editingChanged" id="Jvb-Z0-0cY"/>
                         <action selector="onCountryCodeFieldEnd:" destination="-1" eventType="editingDidEnd" id="QUC-vT-pmS"/>
+                        <outlet property="nextFieldResponder" destination="74" id="Qe8-Qy-zAT"/>
                     </connections>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" tag="107" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" adjustsFontSizeToFit="NO" minimumFontSize="10" id="74" userLabel="phoneField" customClass="UIAssistantTextField">
@@ -181,6 +182,7 @@
                     <connections>
                         <outlet property="delegate" destination="-1" id="80"/>
                         <outlet property="errorLabel" destination="nOO-ch-4RW" id="fVH-OO-tVS"/>
+                        <outlet property="nextFieldResponder" destination="OLm-Nz-ouj" id="RJT-1m-fS4"/>
                     </connections>
                 </textField>
                 <label opaque="NO" userInteractionEnabled="NO" tag="410" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Invalid phone number" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" id="nOO-ch-4RW" userLabel="phoneErrorLabel">
@@ -240,6 +242,7 @@
                             <connections>
                                 <outlet property="delegate" destination="-1" id="ewM-oE-aam"/>
                                 <outlet property="errorLabel" destination="SJT-EF-scd" id="kou-54-9Gg"/>
+                                <outlet property="nextFieldResponder" destination="79" id="ZNJ-ea-EE5"/>
                             </connections>
                         </textField>
                         <label opaque="NO" userInteractionEnabled="NO" tag="410" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Invalid username" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" id="SJT-EF-scd" userLabel="usernameErrorLabel">
@@ -274,6 +277,7 @@
                             <connections>
                                 <outlet property="delegate" destination="-1" id="84"/>
                                 <outlet property="errorLabel" destination="boL-zt-q9f" id="jBP-Jl-eVp"/>
+                                <outlet property="nextFieldResponder" destination="75" id="FR4-Ai-CrM"/>
                             </connections>
                         </textField>
                         <label opaque="NO" userInteractionEnabled="NO" tag="410" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Invalid email" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" id="boL-zt-q9f" userLabel="emailErrorLabel">
@@ -301,6 +305,7 @@
                             <connections>
                                 <outlet property="delegate" destination="-1" id="82"/>
                                 <outlet property="errorLabel" destination="qbL-gD-kHo" id="9pp-bs-jQ2"/>
+                                <outlet property="nextFieldResponder" destination="76" id="hr7-Ql-xdj"/>
                             </connections>
                         </textField>
                         <label opaque="NO" userInteractionEnabled="NO" tag="410" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Invalid password" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" id="qbL-gD-kHo" userLabel="passwordErrorLabel">
@@ -554,6 +559,7 @@ Once it is done, come back here and click on the button.</string>
                     <connections>
                         <outlet property="delegate" destination="-1" id="vfZ-tB-ybd"/>
                         <outlet property="errorLabel" destination="CBb-WR-x0g" id="0j0-6V-znD"/>
+                        <outlet property="nextFieldResponder" destination="ap4-xh-CVK" id="WOg-Yu-470"/>
                     </connections>
                 </textField>
                 <label opaque="NO" userInteractionEnabled="NO" tag="410" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Invalid username" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" id="CBb-WR-x0g" userLabel="usernameErrorLabel">
@@ -581,6 +587,7 @@ Once it is done, come back here and click on the button.</string>
                     <connections>
                         <outlet property="delegate" destination="-1" id="nPx-Tc-Acv"/>
                         <outlet property="errorLabel" destination="lMz-lo-z4b" id="1Se-fB-fYb"/>
+                        <outlet property="nextFieldResponder" destination="buh-Vp-YwP" id="agG-Ue-xBJ"/>
                     </connections>
                 </textField>
                 <label opaque="NO" userInteractionEnabled="NO" tag="410" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Invalid password" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" id="lMz-lo-z4b" userLabel="passwordErrorLabel">
@@ -625,6 +632,7 @@ Once it is done, come back here and click on the button.</string>
                     <connections>
                         <outlet property="delegate" destination="-1" id="QcZ-wS-LhT"/>
                         <outlet property="errorLabel" destination="YzC-qL-tc0" id="SbI-Cd-cxw"/>
+                        <outlet property="nextFieldResponder" destination="y6x-Aq-16J" id="gaY-du-DG9"/>
                     </connections>
                 </textField>
                 <label opaque="NO" userInteractionEnabled="NO" tag="122" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="LINK WITH PHONE NUMBER (OPTIONAL)" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="cac-e8-KHg" userLabel="phoneLabel">
@@ -643,6 +651,7 @@ Once it is done, come back here and click on the button.</string>
                     <connections>
                         <action selector="onCountryCodeFieldChange:" destination="-1" eventType="editingChanged" id="FDR-Ar-diD"/>
                         <action selector="onCountryCodeFieldEnd:" destination="-1" eventType="editingDidEnd" id="hxt-GV-AIo"/>
+                        <outlet property="nextFieldResponder" destination="eD1-BU-COs" id="KxJ-UV-0Ot"/>
                     </connections>
                 </textField>
                 <textField opaque="NO" clipsSubviews="YES" tag="107" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" adjustsFontSizeToFit="NO" minimumFontSize="10" id="eD1-BU-COs" userLabel="phoneField" customClass="UIAssistantTextField">
@@ -737,6 +746,7 @@ Once it is done, come back here and click on the button.</string>
                     <connections>
                         <outlet property="delegate" destination="-1" id="2Cf-FZ-uJk"/>
                         <outlet property="errorLabel" destination="UJ1-kb-e8g" id="XAu-w1-q5R"/>
+                        <outlet property="nextFieldResponder" destination="zEa-Dj-QiH" id="Hne-0h-vna"/>
                     </connections>
                 </textField>
                 <label opaque="NO" userInteractionEnabled="NO" tag="410" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Invalid username" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" id="UJ1-kb-e8g" userLabel="usernameErrorLabel">
@@ -764,6 +774,7 @@ Once it is done, come back here and click on the button.</string>
                     <connections>
                         <outlet property="delegate" destination="-1" id="bYU-bJ-3Ts"/>
                         <outlet property="errorLabel" destination="Oyr-f0-auK" id="0Cr-il-vwE"/>
+                        <outlet property="nextFieldResponder" destination="5kh-Wo-SMY" id="e0h-Wa-i1z"/>
                     </connections>
                 </textField>
                 <label opaque="NO" userInteractionEnabled="NO" tag="410" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Invalid password" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" id="Oyr-f0-auK" userLabel="passwordErrorLabel">
@@ -791,6 +802,7 @@ Once it is done, come back here and click on the button.</string>
                     <connections>
                         <outlet property="delegate" destination="-1" id="AEK-wy-Dko"/>
                         <outlet property="errorLabel" destination="ths-8b-FoU" id="mQu-DC-RgF"/>
+                        <outlet property="nextFieldResponder" destination="7Cb-fa-CY5" id="Cca-hY-8Yr"/>
                     </connections>
                 </textField>
                 <label opaque="NO" userInteractionEnabled="NO" tag="410" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Invalid domain" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" id="ths-8b-FoU" userLabel="domainErrorLabel">
@@ -980,6 +992,7 @@ Once it is done, come back here and click on the button.</string>
                     <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="next"/>
                     <connections>
                         <outlet property="delegate" destination="-1" id="uJC-ra-Bp0"/>
+                        <outlet property="nextFieldResponder" destination="hfJ-yu-wVn" id="q8c-Ze-1iW"/>
                     </connections>
                 </textField>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="PASSWORD" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="JNj-cr-FwU" userLabel="passwordLabel">
@@ -999,6 +1012,7 @@ Once it is done, come back here and click on the button.</string>
                     <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="next" secureTextEntry="YES"/>
                     <connections>
                         <outlet property="delegate" destination="-1" id="oIG-Cs-m9O"/>
+                        <outlet property="nextFieldResponder" destination="gfr-KY-4vo" id="Nqo-Pk-nGv"/>
                     </connections>
                 </textField>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="DOMAIN" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="KTG-uK-Lji" userLabel="domainLabel">
@@ -1018,6 +1032,7 @@ Once it is done, come back here and click on the button.</string>
                     <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="done"/>
                     <connections>
                         <outlet property="delegate" destination="-1" id="6Mx-mR-LQx"/>
+                        <outlet property="nextFieldResponder" destination="hfJ-yu-wVn" id="z3d-Az-1Gd"/>
                     </connections>
                 </textField>
                 <button opaque="NO" tag="130" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" id="eKs-or-rqw" userLabel="remoteProvisioningLoginButton" customClass="UIRoundBorderedButton">
diff --git a/Classes/FirstLoginView.m b/Classes/FirstLoginView.m
index cbb1ef807..feb0662f8 100644
--- a/Classes/FirstLoginView.m
+++ b/Classes/FirstLoginView.m
@@ -157,6 +157,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 		case LinphoneAccountCreatorAccountNotCreated:
 		case LinphoneAccountCreatorAccountNotExist:
 		case LinphoneAccountCreatorAccountNotActivated:
+		case LinphoneAccountCreatorAccountAlreadyActivated:
 		case LinphoneAccountCreatorAccountActivated:
 		case LinphoneAccountCreatorOK:
 			break;
diff --git a/Classes/LinphoneUI/UIAssistantTextField.h b/Classes/LinphoneUI/UIAssistantTextField.h
index dcebf6135..4bab5652e 100644
--- a/Classes/LinphoneUI/UIAssistantTextField.h
+++ b/Classes/LinphoneUI/UIAssistantTextField.h
@@ -12,8 +12,8 @@ typedef BOOL (^DisplayErrorPred)(NSString *inputEntry);
 
 @interface UIAssistantTextField : UITextField <UITextFieldDelegate>
 
-@property(nonatomic, weak) IBOutlet UIView* nextResponder;
-@property(nonatomic, weak) IBOutlet UILabel *errorLabel;
+@property(nonatomic, strong) IBOutlet UIView* nextFieldResponder;
+@property(nonatomic, strong) IBOutlet UILabel *errorLabel;
 @property(nonatomic, readonly) DisplayErrorPred showErrorPredicate;
 
 @property(nonatomic, strong) NSString *lastText;
diff --git a/Classes/LinphoneUI/UIAssistantTextField.m b/Classes/LinphoneUI/UIAssistantTextField.m
index 76692d91f..b463f1f3d 100644
--- a/Classes/LinphoneUI/UIAssistantTextField.m
+++ b/Classes/LinphoneUI/UIAssistantTextField.m
@@ -41,7 +41,7 @@ INIT_WITH_COMMON_CF {
 - (BOOL)isVisible {
 	UIView* aview = self;
 	while (aview) {
-		if (aview.isHidden) return NO;
+		if (aview.isHidden || !aview.isUserInteractionEnabled) return NO;
 		aview = aview.superview;
 	}
 	return YES;
@@ -67,6 +67,14 @@ INIT_WITH_COMMON_CF {
 	return YES;
 }
 
+- (void)textFieldDidBeginEditing:(UITextField *)textField {
+	if (self.nextFieldResponder && !self.nextFieldResponder.hidden) {
+		self.returnKeyType = UIReturnKeyNext;
+	} else {
+		self.returnKeyType = UIReturnKeyDone;
+	}
+
+}
 - (void)textFieldDidEndEditing:(UITextField *)textField {
 	_lastText = textField.text;
 	[self checkDisplayError];
diff --git a/Classes/LinphoneUI/UIRoundBorderedButton.m b/Classes/LinphoneUI/UIRoundBorderedButton.m
index ca6e59ec0..249d94f03 100644
--- a/Classes/LinphoneUI/UIRoundBorderedButton.m
+++ b/Classes/LinphoneUI/UIRoundBorderedButton.m
@@ -53,4 +53,12 @@
 	self.layer.borderColor = [self.titleLabel.textColor CGColor];
 }
 
+- (BOOL)becomeFirstResponder {
+	if ([super becomeFirstResponder]) {
+		[LinphoneUtils findAndResignFirstResponder:self.superview];
+		return YES;
+	}
+	return NO;
+}
+
 @end
diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory
index 7be9066cd..ca2e1672e 100644
--- a/Resources/linphonerc-factory
+++ b/Resources/linphonerc-factory
@@ -18,7 +18,7 @@ history_max_size=-1
 [sip]
 sip_random_port=0
 store_ha1_passwd=0
-handle_content_encoding=none
+#handle_content_encoding=none
 
 [sound]
 dtmf_player_amp=0.007
diff --git a/submodules/linphone b/submodules/linphone
index dec784f7a..fbb24ec87 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit dec784f7a4f1f85401be644d2c0ca6300a08c114
+Subproject commit fbb24ec879896a82c257d986df10a9a2ab416e90