diff --git a/src/Android/Autofill/FieldCollection.cs b/src/Android/Autofill/FieldCollection.cs
index a01aaad70..f11a48406 100644
--- a/src/Android/Autofill/FieldCollection.cs
+++ b/src/Android/Autofill/FieldCollection.cs
@@ -337,7 +337,8 @@ namespace Bit.Droid.Autofill
         
         private bool FieldIsUsername(Field f)
         {
-            return f.InputType.HasFlag(InputTypes.TextVariationWebEmailAddress) || FieldHasUsernameTerms(f);
+            return f.InputType.HasFlag(InputTypes.TextVariationEmailAddress) ||
+                f.InputType.HasFlag(InputTypes.TextVariationWebEmailAddress) || FieldHasUsernameTerms(f);
         }
 
         private bool FieldHasUsernameTerms(Field f)