diff --git a/AndroidManifest.xml b/AndroidManifest.xml
old mode 100644
new mode 100755
index 4814f8d98..5960dc648
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.linphone"
 
-      android:versionCode="3201" android:versionName="3.2.0" android:installLocation="auto">
+      android:versionCode="3202" android:versionName="3.2.0" android:installLocation="auto">
     <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="23"/>
 
     <!-- Permissions for Push Notification -->
diff --git a/release.patch b/release.patch
index 69c5a8620..bbd79a658 100644
--- a/release.patch
+++ b/release.patch
@@ -2,12 +2,12 @@ diff --git a/AndroidManifest.xml b/AndroidManifest.xml
 index 5ef1374..86e13be 100644
 --- a/AndroidManifest.xml
 +++ b/AndroidManifest.xml
-@@ -45,7 +45,7 @@
- 
+@@ -52,7 +52,7 @@
+
  	<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true"/>
-     
+
 -    <application android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:largeHeap="true" android:allowBackup="true">
 +    <application android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:largeHeap="true" android:allowBackup="true" android:debuggable="false">
- 
+
  		<activity android:name="org.linphone.LinphoneLauncherActivity"
  		    android:label="@string/app_name"
diff --git a/src/org/linphone/LinphoneActivity.java b/src/org/linphone/LinphoneActivity.java
index ca7d5bad8..763e7d1e9 100644
--- a/src/org/linphone/LinphoneActivity.java
+++ b/src/org/linphone/LinphoneActivity.java
@@ -226,9 +226,9 @@ public class LinphoneActivity extends Activity implements OnClickListener, Conta
 
 				refreshAccounts();
 
-				if(state.equals(RegistrationState.RegistrationOk) && LinphonePreferences.instance().getLinkPopupTime() != ""){
-					if(getResources().getBoolean(R.bool.use_phone_number_validation)) {
-						if (LinphonePreferences.instance().getLinkPopupTime() == null || (LinphonePreferences.instance().getLinkPopupTime() != null)){
+				if(getResources().getBoolean(R.bool.use_phone_number_validation)) {
+					if (state.equals(RegistrationState.RegistrationOk)) {
+						if (LinphonePreferences.instance().getLinkPopupTime() == null || (LinphonePreferences.instance().getLinkPopupTime() != null)) {
 							LinphoneManager.getInstance().isAccountWithAlias();
 						}
 					}
diff --git a/src/org/linphone/assistant/LinphoneLoginFragment.java b/src/org/linphone/assistant/LinphoneLoginFragment.java
index 65e0350ed..445ed2138 100644
--- a/src/org/linphone/assistant/LinphoneLoginFragment.java
+++ b/src/org/linphone/assistant/LinphoneLoginFragment.java
@@ -328,9 +328,9 @@ public class LinphoneLoginFragment extends Fragment implements CompoundButton.On
 				dial = accountCreator.getPrefix(phone);
 			AssistantActivity.instance().linphoneLogIn(login.getText().toString(), password.getText().toString(), dial, null, getResources().getBoolean(R.bool.assistant_account_validation_mandatory));
 		} else {
-			apply.setEnabled(true);
 			LinphoneUtils.displayErrorAlert(LinphoneUtils.errorForStatus(status), AssistantActivity.instance());
 		}
+		apply.setEnabled(true);
 	}
 
 	@Override