diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index 4439e87f02..20096a0bd7 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -663,7 +663,7 @@ export default class AutofillService implements AutofillServiceInterface {
                     fillFields.phone = f;
                     break;
                 } else if (!fillFields.username && this.isFieldMatch(f[attr],
-                    ['user-name', 'user-id', 'screen-name'])) {
+                    IdentityAutoFillConstants.UserNameFieldNames)) {
                     fillFields.username = f;
                     break;
                 } else if (!fillFields.company && this.isFieldMatch(f[attr],
diff --git a/src/services/autofillConstants.ts b/src/services/autofillConstants.ts
index 875a462b4f..6b6c387936 100644
--- a/src/services/autofillConstants.ts
+++ b/src/services/autofillConstants.ts
@@ -297,6 +297,8 @@ export class IdentityAutoFillConstants {
     "phone-number",
   ];
 
+  static readonly UserNameFieldNames: string[] = ["user-name", "user-id", "screen-name"];
+
   static readonly IsoCountries: { [id: string]: string } = {
     afghanistan: "AF",
     "aland islands": "AX",