diff --git a/jslib b/jslib
index 3bf322a904..f30d6f8027 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 3bf322a904cd7ccb8c7e77edbecf8e152feb7364
+Subproject commit f30d6f8027055507abfdefd1eeb5d9aab25cc601
diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index 8e2c0ed145..3853bca7d3 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -903,16 +903,20 @@ export default class AutofillService implements AutofillServiceInterface {
                 if (value == null) {
                     return false;
                 }
-                const lowerValue = value.toLowerCase();
-                if (lowerValue.indexOf('onetimepassword') >= 0) {
+                // Removes all whitespace and _ characters
+                const cleanedValue = value.toLowerCase().trim().replace(/[\s_]/g, '');
+
+                if (cleanedValue.indexOf('password') < 0) {
                     return false;
                 }
-                if (lowerValue.indexOf('password') < 0) {
-                    return false;
-                }
-                if (lowerValue.indexOf('captcha') >= 0) {
-                    return false;
+
+                const ignoreList = ['onetimepassword', 'captcha', 'findanything']
+                for (let index = 0; index < ignoreList.length; index++) {
+                    if (cleanedValue.indexOf(ignoreList[index]) > -1) {
+                        return false;
+                    }
                 }
+
                 return true;
             };
             const isLikePassword = () => {