diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index 6d489aebdc..2a34f98b49 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -435,23 +435,25 @@ export default class AutofillService implements AutofillServiceInterface {
                     ['cc-name', 'card-name', 'cardholder-name', 'cardholder'])) {
                     fillFields.cardholderName = f;
                 } else if (!fillFields.number && this.isFieldMatch(f[attr],
-                    ['cc-number', 'cc-num', 'card-number', 'card-num', 'number', 'cc', 'cc-no'],
+                    ['cc-number', 'cc-num', 'card-number', 'card-num', 'number', 'cc', 'cc-no', 'card-no'],
                     ['cc-number', 'cc-num', 'card-number', 'card-num', 'cc-no', 'card-no'])) {
                     fillFields.number = f;
                 } else if (!fillFields.exp && this.isFieldMatch(f[attr],
-                    ['cc-exp', 'card-exp', 'cc-expiration', 'card-expiration', 'cc-ex', 'card-ex'],
+                    ['cc-exp', 'card-exp', 'cc-expiration', 'card-expiration', 'cc-ex', 'card-ex', 'card-expire'],
                     [])) {
                     fillFields.exp = f;
                 } else if (!fillFields.expMonth && this.isFieldMatch(f[attr],
                     ['exp-month', 'cc-exp-month', 'cc-month', 'card-month', 'cc-mo', 'card-mo', 'exp-mo',
                         'card-exp-mo', 'cc-exp-mo', 'card-expiration-month', 'expiration-month',
-                        'cc-mm', 'cc-m', 'card-mm', 'card-m', 'card-exp-mm', 'cc-exp-mm', 'exp-mm', 'exp-m'])) {
+                        'cc-mm', 'cc-m', 'card-mm', 'card-m', 'card-exp-mm', 'cc-exp-mm', 'exp-mm', 'exp-m',
+                        'expire-month', 'expire-mo', 'card-expire-month', 'card-expire-mo'])) {
                     fillFields.expMonth = f;
                 } else if (!fillFields.expYear && this.isFieldMatch(f[attr],
                     ['exp-year', 'cc-exp-year', 'cc-year', 'card-year', 'cc-yr', 'card-yr', 'exp-yr',
                         'card-exp-yr', 'cc-exp-yr', 'card-expiration-year', 'expiration-year',
                         'cc-yy', 'cc-y', 'card-yy', 'card-y', 'card-exp-yy', 'cc-exp-yy', 'exp-yy', 'exp-y',
-                        'cc-yyyy', 'card-yyyy', 'card-exp-yyyy', 'cc-exp-yyyy'])) {
+                        'cc-yyyy', 'card-yyyy', 'card-exp-yyyy', 'cc-exp-yyyy',
+                        'expire-year', 'expire-yr', 'card-expire-year', 'card-expire-yr'])) {
                     fillFields.expYear = f;
                 } else if (!fillFields.code && this.isFieldMatch(f[attr],
                     ['cvv', 'cvc', 'cvv2', 'cc-csc', 'cc-cvv', 'card-csc', 'card-cvv', 'cvd',