diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index 10a760c4ae2..8dd3f99230b 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -805,11 +805,14 @@ export default class AutofillService implements AutofillServiceInterface {
     private loadPasswordFields(pageDetails: AutofillPageDetails, canBeHidden: boolean) {
         const arr: AutofillField[] = [];
         pageDetails.fields.forEach((f) => {
-            if (!f.disabled && !f.readonly && f.type === 'password' && (canBeHidden || f.viewable)) {
+            const isPassword = f.type === 'password';
+            const isLikePassword = f.type === 'text' && ((f.htmlID != null && f.htmlID.toLowerCase() === 'password') ||
+                (f.htmlName != null && f.htmlName.toLowerCase() === 'password') ||
+                (f.placeholder != null && f.placeholder.toLowerCase() === 'password'));
+            if (!f.disabled && !f.readonly && (isPassword || isLikePassword) && (canBeHidden || f.viewable)) {
                 arr.push(f);
             }
         });
-
         return arr;
     }