diff --git a/src/services/autofill.service.ts b/src/services/autofill.service.ts
index 04697f22ec..80a53f80ad 100644
--- a/src/services/autofill.service.ts
+++ b/src/services/autofill.service.ts
@@ -622,7 +622,7 @@ export default class AutofillService implements AutofillServiceInterface {
                     fillFields.title = f;
                     break;
                 } else if (!fillFields.email && this.isFieldMatch(f[attr],
-                    ['e-mail', 'email-address'])) {
+                    IdentityAutoFillConstants.EmailFieldNames)) {
                     fillFields.email = f;
                     break;
                 } else if (!fillFields.address && this.isFieldMatch(f[attr],
diff --git a/src/services/autofillConstants.ts b/src/services/autofillConstants.ts
index aa5d5ba0b4..7f5428cf9e 100644
--- a/src/services/autofillConstants.ts
+++ b/src/services/autofillConstants.ts
@@ -225,6 +225,8 @@ export class IdentityAutoFillConstants {
     "familienname",
   ];
 
+  static readonly EmailFieldNames: string[] = ["e-mail", "email-address"];
+
   static readonly IsoCountries: { [id: string]: string } = {
     afghanistan: "AF",
     "aland islands": "AX",