diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConsts.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConsts.cs
index 255f01c0ab..4dcd003af2 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConsts.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConsts.cs
@@ -7,7 +7,13 @@ public static class TenantConsts
     /// </summary>
     public static int MaxNameLength { get; set; } = 64;
 
-    public const int MaxPasswordLength = 128; 
-    
-    public const int AdminEmailAddress = 256; 
+    /// <summary>
+    /// Default value: 128
+    /// </summary>
+    public static int MaxPasswordLength { get; set; } = 128;
+
+    /// <summary>
+    /// Default value: 256
+    /// </summary>
+    public static int AdminEmailAddress { get; set; } = 256; 
 }
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs
index c9f73d8aa0..24f732442d 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs
@@ -43,12 +43,13 @@ public class CreateModalModel : TenantManagementPageModel
 
         [Required]
         [EmailAddress]
-        [MaxLength(TenantConsts.AdminEmailAddress)]
+        [DynamicStringLength(typeof(TenantConsts), nameof(TenantConsts.AdminEmailAddress))]
+
         public string AdminEmailAddress { get; set; }
 
         [Required]
         [DataType(DataType.Password)]
-        [MaxLength(TenantConsts.MaxPasswordLength)]
+        [DynamicStringLength(typeof(TenantConsts), nameof(TenantConsts.MaxPasswordLength))]
         public string AdminPassword { get; set; }
     }
 }