diff --git a/clients/android/NewsBlur/app/src/main/res/layout/activity_main.xml b/clients/android/NewsBlur/app/src/main/res/layout/activity_main.xml
index 630e1e991..ea3daa559 100644
--- a/clients/android/NewsBlur/app/src/main/res/layout/activity_main.xml
+++ b/clients/android/NewsBlur/app/src/main/res/layout/activity_main.xml
@@ -175,7 +175,7 @@
         android:imeOptions="actionSearch"
         android:visibility="gone"
         android:animateLayoutChanges="true"
-    />
+        android:importantForAutofill="no" />
 
     <!-- The scrollable and pull-able feed list.  -->
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
diff --git a/clients/android/NewsBlur/app/src/main/res/layout/activity_share_external_story.xml b/clients/android/NewsBlur/app/src/main/res/layout/activity_share_external_story.xml
index 6291b7310..932a5d8ee 100644
--- a/clients/android/NewsBlur/app/src/main/res/layout/activity_share_external_story.xml
+++ b/clients/android/NewsBlur/app/src/main/res/layout/activity_share_external_story.xml
@@ -41,7 +41,8 @@
             android:hint="@string/share_comment_hint"
             android:inputType="textCapSentences|textMultiLine"
             android:singleLine="false"
-            android:textSize="15sp" />
+            android:textSize="15sp"
+            android:importantForAutofill="no" />
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/container_buttons"
diff --git a/clients/android/NewsBlur/app/src/main/res/layout/fragment_loginregister.xml b/clients/android/NewsBlur/app/src/main/res/layout/fragment_loginregister.xml
index 34ff69fca..8c714b27f 100644
--- a/clients/android/NewsBlur/app/src/main/res/layout/fragment_loginregister.xml
+++ b/clients/android/NewsBlur/app/src/main/res/layout/fragment_loginregister.xml
@@ -24,6 +24,7 @@
                 android:id="@+id/login_username"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
+                android:autofillHints="username"
                 android:hint="@string/login_username_hint"
                 android:inputType="textEmailAddress"
                 android:textSize="22sp" />
@@ -33,6 +34,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="30dp"
+                android:autofillHints="password"
                 android:hint="@string/login_password_hint"
                 android:imeOptions="actionDone"
                 android:inputType="textPassword"
@@ -103,7 +105,8 @@
             android:hint="@string/login_custom_server_hint"
             android:inputType="textNoSuggestions|textMultiLine"
             android:textSize="17sp"
-            android:visibility="invisible" />
+            android:visibility="invisible"
+            android:importantForAutofill="no" />
 
         <TextView
             android:id="@+id/button_reset_url"
@@ -165,6 +168,7 @@
                     android:id="@+id/registration_username"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:autofillHints="username"
                     android:hint="@string/login_username_hint"
                     android:inputType="textEmailAddress"
                     android:textSize="22sp">
@@ -176,6 +180,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="30dp"
+                    android:autofillHints="password"
                     android:hint="@string/login_password_hint"
                     android:inputType="textPassword"
                     android:nextFocusDown="@+id/registration_email"
@@ -186,6 +191,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="30dp"
+                    android:autofillHints="emailAddress"
                     android:hint="@string/login_registration_email_hint"
                     android:imeOptions="actionDone"
                     android:inputType="textEmailAddress"
diff --git a/clients/android/NewsBlur/app/src/main/res/layout/loginas_dialog.xml b/clients/android/NewsBlur/app/src/main/res/layout/loginas_dialog.xml
index 1ed046f95..55c7cd68f 100644
--- a/clients/android/NewsBlur/app/src/main/res/layout/loginas_dialog.xml
+++ b/clients/android/NewsBlur/app/src/main/res/layout/loginas_dialog.xml
@@ -12,6 +12,7 @@
         android:layout_marginBottom="10dp"
         android:layout_marginTop="5dp"
         android:singleLine="false"
+        android:autofillHints="username"
         android:inputType="textCapSentences|textMultiLine" />
 
 </RelativeLayout>
diff --git a/clients/android/NewsBlur/app/src/main/res/layout/reply_dialog.xml b/clients/android/NewsBlur/app/src/main/res/layout/reply_dialog.xml
index 46678e06a..5713373ee 100644
--- a/clients/android/NewsBlur/app/src/main/res/layout/reply_dialog.xml
+++ b/clients/android/NewsBlur/app/src/main/res/layout/reply_dialog.xml
@@ -12,6 +12,7 @@
         android:layout_marginBottom="10dp"
         android:layout_marginTop="5dp"
         android:singleLine="false"
-        android:inputType="textCapSentences|textMultiLine" />
+        android:inputType="textCapSentences|textMultiLine"
+        android:importantForAutofill="no" />
 
 </RelativeLayout>
diff --git a/clients/android/NewsBlur/app/src/main/res/layout/share_dialog.xml b/clients/android/NewsBlur/app/src/main/res/layout/share_dialog.xml
index fb85d7820..c402cc104 100644
--- a/clients/android/NewsBlur/app/src/main/res/layout/share_dialog.xml
+++ b/clients/android/NewsBlur/app/src/main/res/layout/share_dialog.xml
@@ -13,6 +13,7 @@
         android:layout_marginTop="5dp"
         android:singleLine="false"
         android:inputType="textCapSentences|textMultiLine"
-        android:hint="@string/share_comment_hint"/>
+        android:hint="@string/share_comment_hint"
+        android:importantForAutofill="no" />
 
 </RelativeLayout>