diff --git a/app/build.gradle b/app/build.gradle
index 6eaf1a521..07b33bb59 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -152,7 +152,7 @@ android {
 
 dependencies {
     if (firebaseEnabled()) {
-        implementation 'com.google.firebase:firebase-messaging:17.5.0'
+        implementation 'com.google.firebase:firebase-messaging:19.0.1'
     }
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.0.2'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 473932751..3aba5d92f 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -237,7 +237,9 @@
                 android:resource="@xml/authenticator" />
         </service>
 
-        <service android:name=".firebase.FirebaseMessaging">
+        <service android:name=".firebase.FirebaseMessaging"
+            android:enabled="true"
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
diff --git a/app/src/main/java/org/linphone/assistant/AssistantActivity.java b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
index 569f78017..9636db41e 100644
--- a/app/src/main/java/org/linphone/assistant/AssistantActivity.java
+++ b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
@@ -19,11 +19,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-import static org.linphone.core.AccountCreator.UsernameStatus.Invalid;
-import static org.linphone.core.AccountCreator.UsernameStatus.InvalidCharacters;
-import static org.linphone.core.AccountCreator.UsernameStatus.TooLong;
-import static org.linphone.core.AccountCreator.UsernameStatus.TooShort;
-
 import android.app.AlertDialog;
 import android.content.Intent;
 import android.os.Bundle;
diff --git a/app/src/main/java/org/linphone/settings/AccountSettingsFragment.java b/app/src/main/java/org/linphone/settings/AccountSettingsFragment.java
index 52ebc01be..1dcbc639c 100644
--- a/app/src/main/java/org/linphone/settings/AccountSettingsFragment.java
+++ b/app/src/main/java/org/linphone/settings/AccountSettingsFragment.java
@@ -258,6 +258,11 @@ public class AccountSettingsFragment extends SettingsFragment {
                         if (newValue.isEmpty()) {
                             return;
                         }
+                        if (newValue.contains(":")) {
+                            Log.e(
+                                    "[Account Settings] Do not specify port information inside domain field !");
+                            return;
+                        }
 
                         if (mAuthInfo != null) {
                             mAuthInfo.setDomain(newValue);