diff --git a/src/models/request/tokenRequest.ts b/src/models/request/tokenRequest.ts
index 877c663eb97..757801279c7 100644
--- a/src/models/request/tokenRequest.ts
+++ b/src/models/request/tokenRequest.ts
@@ -73,4 +73,10 @@ export class TokenRequest {
 
         return obj;
     }
+
+    alterIdentityTokenHeaders(headers: Headers) {
+        if (this.clientSecret == null && this.masterPasswordHash != null && this.email != null) {
+            headers.set('Auth-Email', this.email);
+        }
+    }
 }
diff --git a/src/services/api.service.ts b/src/services/api.service.ts
index db007b72653..d9e0265b7b0 100644
--- a/src/services/api.service.ts
+++ b/src/services/api.service.ts
@@ -206,6 +206,7 @@ export class ApiService implements ApiServiceAbstraction {
         if (this.customUserAgent != null) {
             headers.set('User-Agent', this.customUserAgent);
         }
+        request.alterIdentityTokenHeaders(headers);
         const response = await this.fetch(new Request(this.identityBaseUrl + '/connect/token', {
             body: this.qsStringify(request.toIdentityToken(request.clientId ?? this.platformUtilsService.identityClientId)),
             credentials: this.getCredentials(),