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 b78624e1..2bfa5075 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
@@ -122,6 +122,8 @@ class FormField(
         private val OTP_HEURISTIC_TERMS = listOf(
             "einmal",
             "otp",
+            "challenge",
+            "verification",
         )
         private val OTP_WEAK_HEURISTIC_TERMS = listOf(
             "code",