diff --git a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts
index de7a6ad644..4aaac15f96 100644
--- a/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts
+++ b/npm/ng-packs/packages/tenant-management/src/lib/components/tenants/tenants.component.ts
@@ -1,5 +1,5 @@
 import { ABP } from '@abp/ng.core';
-import { ConfirmationService, Confirmation } from '@abp/ng.theme.shared';
+import { ConfirmationService, Confirmation, getPasswordValidators } from '@abp/ng.theme.shared';
 import { Component, OnInit, TemplateRef, ViewChild, ChangeDetectorRef } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { Select, Store } from '@ngxs/store';
@@ -122,7 +122,7 @@ export class TenantsComponent implements OnInit {
     const tenantForm = this.fb.group({
       name: [this.selected.name || '', [Validators.required, Validators.maxLength(256)]],
       adminEmailAddress: [null, [Validators.required, Validators.maxLength(256), Validators.email]],
-      adminPassword: [null, [Validators.required]],
+      adminPassword: [null, [Validators.required, ...getPasswordValidators(this.store)]],
     });
 
     if (this.hasSelectedTenant) {
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts b/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts
index c1067a0042..966135fad7 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/utils/validation-utils.ts
@@ -1,11 +1,11 @@
 import { Store } from '@ngxs/store';
 import { ABP, ConfigState } from '@abp/ng.core';
 import { PasswordRules, validatePassword } from '@ngx-validate/core';
-import { Validators } from '@angular/forms';
+import { Validators, ValidatorFn } from '@angular/forms';
 
 const { minLength, maxLength } = Validators;
 
-export function getPasswordValidators(store: Store) {
+export function getPasswordValidators(store: Store): ValidatorFn[] {
   const getRule = getRuleFn(store);
 
   const passwordRulesArr = [] as PasswordRules;