diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebAutoMapperProfile.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebAutoMapperProfile.cs
index d226e9629c..e04a6bdc03 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebAutoMapperProfile.cs
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/AbpTenantManagementWebAutoMapperProfile.cs
@@ -13,11 +13,11 @@ namespace Volo.Abp.TenantManagement.Web
 
             //CreateModal
             CreateMap<CreateModalModel.TenantInfoModel, TenantCreateDto>()
-                .Ignore(x => x.ExtraProperties);
+                .MapExtraProperties();
 
             //EditModal
             CreateMap<EditModalModel.TenantInfoModel, TenantUpdateDto>()
-                .Ignore(x => x.ExtraProperties);
+                .MapExtraProperties();
         }
     }
 }
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml
index 6d143f8adf..1728f0ea82 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml
@@ -1,4 +1,5 @@
 @page
+@using Microsoft.AspNetCore.Mvc.Localization
 @using Microsoft.Extensions.Localization
 @using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
 @using Volo.Abp.Localization
@@ -6,14 +7,14 @@
 @using Volo.Abp.TenantManagement.Localization
 @using Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
 @model CreateModalModel
-@inject IStringLocalizer<AbpTenantManagementResource> L
+@inject IHtmlLocalizer<AbpTenantManagementResource> L
 @inject IStringLocalizerFactory StringLocalizerFactory
 @{
     Layout = null;
 }
 <form method="post" asp-page="/TenantManagement/Tenants/CreateModal">
     <abp-modal>
-        <abp-modal-header title="@L["NewTenant"]"></abp-modal-header>
+        <abp-modal-header title="@L["NewTenant"].Value"></abp-modal-header>
         <abp-modal-body>
             <abp-input asp-for="Tenant.Name" />
 
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 a3c94c7545..82050430a0 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
@@ -20,6 +20,7 @@ namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants
 
         public virtual Task<IActionResult> OnGetAsync()
         {
+            Tenant = new TenantInfoModel();
             return Task.FromResult<IActionResult>(Page());
         }
 
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml
index 752ef85c47..71367676d9 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml
@@ -20,9 +20,19 @@
             <abp-input asp-for="Tenant.Name" label="@L["TenantName"].Value" />
             @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<EditModalModel.TenantInfoModel>())
             {
-                <abp-input type="@propertyInfo.GetInputType()"
-                           asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
-                           label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)" />
+                if (propertyInfo.Type.IsEnum)
+                {
+                    <abp-select asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
+                                label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"></abp-select>
+                }
+                else
+                {
+                    <abp-input type="@propertyInfo.GetInputType()"
+                               asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
+                               label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                               asp-format="@propertyInfo.GetInputFormatOrNull()"
+                               value="@propertyInfo.GetInputValueOrNull(Model.Tenant.ExtraProperties[propertyInfo.Name])" />
+                }
             }
         </abp-modal-body>
         <abp-modal-footer buttons="@(AbpModalButtons.Cancel|AbpModalButtons.Save)"></abp-modal-footer>