diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/FormField.kt b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/FormField.kt
index 8a3380cc3..cb60d6243 100644
--- a/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/FormField.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/autofill/oreo/FormField.kt
@@ -80,10 +80,10 @@ class FormField(
             "search", "find", "captcha"
         )
         private val PASSWORD_HEURISTIC_TERMS = listOf(
-            "pass", "pwd", "pswd"
+            "pass", "pswd", "pwd"
         )
         private val USERNAME_HEURISTIC_TERMS = listOf(
-            "user", "name", "email"
+            "e-mail", "email", "login", "name", "user"
         )
     }