diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index 65fbf217a9..1e7e529091 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -388,8 +388,7 @@ export default class AutofillService implements AutofillServiceInterface {
                     break;
                 } else if (!fillFields.number && this.isFieldMatch(f[attr],
                     CreditCardAutoFillConstants.CardNumberFieldNames,
-                    ['cc-number', 'cc-num', 'card-number', 'card-num', 'cc-no', 'card-no', 'numero-carte',
-                        'num-carte', 'cb-num'])) {
+                    CreditCardAutoFillConstants.CardNumberFieldNameValues)) {
                     fillFields.number = f;
                     break;
                 } else if (!fillFields.exp && this.isFieldMatch(f[attr],
diff --git a/src/services/autofillConstants.ts b/src/services/autofillConstants.ts
index 1fdbf69807..a969c1e8d0 100644
--- a/src/services/autofillConstants.ts
+++ b/src/services/autofillConstants.ts
@@ -91,6 +91,18 @@ export class CreditCardAutoFillConstants {
     "cb-num",
   ];
 
+  static readonly CardNumberFieldNameValues: string[] = [
+    "cc-number",
+    "cc-num",
+    "card-number",
+    "card-num",
+    "cc-no",
+    "card-no",
+    "numero-carte",
+    "num-carte",
+    "cb-num",
+  ];
+
   static readonly CardExpiryFieldNames: string[] = [
     "cc-exp",
     "card-exp",