diff --git a/ring-android/app/src/main/java/cx/ring/fragments/AccountMigrationFragment.kt b/ring-android/app/src/main/java/cx/ring/fragments/AccountMigrationFragment.kt
index f46de5f3af321eb6c1124c6afd7b0ac37af658b3..b96364ca891195726da680a7ad5af3d72d20f8f1 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/AccountMigrationFragment.kt
+++ b/ring-android/app/src/main/java/cx/ring/fragments/AccountMigrationFragment.kt
@@ -126,7 +126,7 @@ class AccountMigrationFragment : Fragment() {
 
     private fun checkPassword(pwd: TextView, confirm: TextView?): Boolean {
         var error = false
-        if (pwd.text.length == 0) {
+        if (pwd.text.isEmpty()) {
             error = true
         } else {
             if (pwd.text.length < 6) {
diff --git a/ring-android/app/src/main/res/layout/frag_acc_jami_password.xml b/ring-android/app/src/main/res/layout/frag_acc_jami_password.xml
index 50d158503f174559e86ae6202650ca286cfbd731..77e67edf39639789b3ff85e6aabf5ec47d4a8e00 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_jami_password.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_jami_password.xml
@@ -81,7 +81,7 @@
                     android:id="@+id/ring_password"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:autofillHints="username"
+                    android:autofillHints="password,newPassword"
                     android:hint="@string/prompt_new_password"
                     android:imeOptions="actionNext"
                     android:inputType="textPassword" />
@@ -103,7 +103,7 @@
                     android:id="@+id/ring_password_repeat"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:autofillHints="username"
+                    android:autofillHints="password,newPassword"
                     android:hint="@string/prompt_new_password_repeat"
                     android:imeActionLabel="@string/action_create_short"
                     android:imeOptions="actionDone"
diff --git a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountCreationPresenter.kt b/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountCreationPresenter.kt
index ac76c1f59eb7ac01402de03b839f4aec1e58c7c9..53d8b4ed58b6cec52f3bd47726e3486aee96e9f0 100644
--- a/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountCreationPresenter.kt
+++ b/ring-android/libjamiclient/src/main/kotlin/net/jami/account/JamiAccountCreationPresenter.kt
@@ -99,7 +99,7 @@ class JamiAccountCreationPresenter @Inject constructor(
 
     fun passwordChanged(password: String) {
         mAccountCreationModel?.password = password
-        if (!isEmpty(password) && password.length < PASSWORD_MIN_LENGTH) {
+        if (password.isNotEmpty() && password.length < PASSWORD_MIN_LENGTH) {
             view?.showInvalidPasswordError(true)
             isPasswordCorrect = false
         } else {