diff --git a/npm/ng-packs/packages/account/src/lib/components/reset-password/reset-password.component.ts b/npm/ng-packs/packages/account/src/lib/components/reset-password/reset-password.component.ts
index 5e311e7b83..b84c6db3a3 100644
--- a/npm/ng-packs/packages/account/src/lib/components/reset-password/reset-password.component.ts
+++ b/npm/ng-packs/packages/account/src/lib/components/reset-password/reset-password.component.ts
@@ -18,6 +18,7 @@ export class ResetPasswordComponent implements OnInit {
   inProgress = false;
 
   isPasswordReset = false;
+  tenantId = '';
 
   mapErrorsFn: Validation.MapErrorsFn = (errors, groupErrors, control) => {
     if (PASSWORD_FIELDS.indexOf(String(control.name)) < 0) return errors;
@@ -34,7 +35,8 @@ export class ResetPasswordComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
-    this.route.queryParams.subscribe(({ userId, resetToken }) => {
+    this.route.queryParams.subscribe(({ userId, resetToken, tenantId }) => {
+      this.tenantId = tenantId;
       if (!userId || !resetToken) this.router.navigateByUrl('/account/login');
 
       this.form = this.fb.group(
@@ -61,6 +63,7 @@ export class ResetPasswordComponent implements OnInit {
         userId: this.form.get('userId').value,
         resetToken: this.form.get('resetToken').value,
         password: this.form.get('password').value,
+        tenantId: this.tenantId || undefined, // if this.tenantId is empty, we should not send it at all
       })
       .pipe(finalize(() => (this.inProgress = false)))
       .subscribe(() => {