diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index 0e59cc8c22..13435a2660 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -635,7 +635,7 @@ export default class AutofillService implements AutofillServiceInterface {
                     fillFields.address1 = f;
                     break;
                 } else if (!fillFields.address2 && this.isFieldMatch(f[attr],
-                    ['address-2', 'address-line-2', 'addr-2', 'street-2'])) {
+                    IdentityAutoFillConstants.Address2FieldNames)) {
                     fillFields.address2 = f;
                     break;
                 } else if (!fillFields.address3 && this.isFieldMatch(f[attr],
diff --git a/src/services/autofillConstants.ts b/src/services/autofillConstants.ts
index 995aa0ca37..cd1b30e20f 100644
--- a/src/services/autofillConstants.ts
+++ b/src/services/autofillConstants.ts
@@ -234,6 +234,13 @@ export class IdentityAutoFillConstants {
     "street-1",
   ];
 
+  static readonly Address2FieldNames: string[] = [
+    "address-2",
+    "address-line-2",
+    "addr-2",
+    "street-2",
+  ];
+
   static readonly IsoCountries: { [id: string]: string } = {
     afghanistan: "AF",
     "aland islands": "AX",