diff --git a/app/src/main/res/layout/fragment_login_advanced.xml b/app/src/main/res/layout/fragment_login_advanced.xml
index 55bc62ae..65af0b54 100644
--- a/app/src/main/res/layout/fragment_login_advanced.xml
+++ b/app/src/main/res/layout/fragment_login_advanced.xml
@@ -118,6 +118,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:autofillHints="username|emailAddress"
+                    android:importantForAutofill="yes"
                     android:inputType="textEmailAddress"
                     android:maxLines="1"
                     tools:targetApi="o" />
@@ -151,6 +152,7 @@
                     android:autofillHints="password"
                     android:imeActionLabel="@string/login_sign_in"
                     android:imeOptions="actionDone"
+                    android:importantForAutofill="yes"
                     android:inputType="textPassword"
                     android:maxLines="1"
                     app:fontFamily="sans-serif"
diff --git a/app/src/main/res/layout/fragment_login_form.xml b/app/src/main/res/layout/fragment_login_form.xml
index ba261e09..e4a5fab7 100644
--- a/app/src/main/res/layout/fragment_login_form.xml
+++ b/app/src/main/res/layout/fragment_login_form.xml
@@ -134,6 +134,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:autofillHints="username|emailAddress"
+                    android:importantForAutofill="yes"
                     android:inputType="textEmailAddress"
                     android:maxLines="1"
                     tools:targetApi="o" />
@@ -167,6 +168,7 @@
                     android:autofillHints="password"
                     android:imeActionLabel="@string/login_sign_in"
                     android:imeOptions="actionDone"
+                    android:importantForAutofill="yes"
                     android:inputType="textPassword"
                     android:maxLines="1"
                     app:fontFamily="sans-serif"