diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index 043bc465bf..5c5ed2ade8 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -423,9 +423,9 @@ export default class AutofillService implements AutofillServiceInterface {
                     break;
                 } else if (!fillFields.number && this.isFieldMatch(f[attr],
                     ['cc-number', 'cc-num', 'card-number', 'card-num', 'number', 'cc', 'cc-no', 'card-no',
-                        'credit-card', 'numero-carte', 'carte', 'carte-credit', 'num-carte'],
+                        'credit-card', 'numero-carte', 'carte', 'carte-credit', 'num-carte', 'cb-num'],
                     ['cc-number', 'cc-num', 'card-number', 'card-num', 'cc-no', 'card-no', 'numero-carte',
-                        'num-carte'])) {
+                        'num-carte', 'cb-num'])) {
                     fillFields.number = f;
                     break;
                 } else if (!fillFields.exp && this.isFieldMatch(f[attr],
@@ -445,7 +445,7 @@ export default class AutofillService implements AutofillServiceInterface {
                         'card-expire-mo', 'card-expiry-month', 'card-expiry-mo', 'mois-validite',
                         'mois-expiration', 'm-validite', 'm-expiration', 'expiry-date-field-month',
                         'expiration-date-month', 'expiration-date-mm', 'exp-mon', 'validity-mo',
-                        'exp-date-mo'])) {
+                        'exp-date-mo', 'cb-date-mois'])) {
                     fillFields.expMonth = f;
                     break;
                 } else if (!fillFields.expYear && this.isFieldMatch(f[attr],
@@ -455,7 +455,7 @@ export default class AutofillService implements AutofillServiceInterface {
                         'cc-yyyy', 'card-yyyy', 'card-exp-yyyy', 'cc-exp-yyyy', 'expire-year', 'expire-yr',
                         'expiry-year', 'expiry-yr', 'card-expire-year', 'card-expire-yr', 'card-expiry-year',
                         'card-expiry-yr', 'an-validite', 'an-expiration', 'annee-validite',
-                        'annee-expiration', 'expiry-date-field-year', 'expiration-date-year',
+                        'annee-expiration', 'expiry-date-field-year', 'expiration-date-year', 'cb-date-ann',
                         'expiration-date-yy', 'expiration-date-yyyy', 'validity-year', 'exp-date-year'])) {
                     fillFields.expYear = f;
                     break;
@@ -466,7 +466,7 @@ export default class AutofillService implements AutofillServiceInterface {
                     fillFields.code = f;
                     break;
                 } else if (!fillFields.brand && this.isFieldMatch(f[attr],
-                    ['cc-type', 'card-type', 'card-brand', 'cc-brand'])) {
+                    ['cc-type', 'card-type', 'card-brand', 'cc-brand', 'cb-type'])) {
                     fillFields.brand = f;
                     break;
                 }