diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml
index 169f96a28b..9c1af360d8 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml
@@ -24,12 +24,7 @@
 
             @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<CreateModalModel.RoleInfoModel>())
             {
-                if (propertyInfo.Type.IsEnum)
-                {
-                    <abp-select asp-for="Role.ExtraProperties[propertyInfo.Name]"
-                                label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"></abp-select>
-                }
-                else if (!propertyInfo.LookupConfiguration.ApiUrl.IsNullOrEmpty())
+                if (propertyInfo.Type.IsEnum || !propertyInfo.LookupConfiguration.ApiUrl.IsNullOrEmpty())
                 {
                     <abp-select asp-for="Role.ExtraProperties[propertyInfo.Name]"
                                 label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml
index 2fbc946003..56b7c356da 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml
@@ -35,12 +35,7 @@
 
             @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<CreateModalModel.RoleInfoModel>())
             {
-                if (propertyInfo.Type.IsEnum)
-                {
-                    <abp-select asp-for="Role.ExtraProperties[propertyInfo.Name]"
-                                label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"></abp-select>
-                }
-                else if (!propertyInfo.LookupConfiguration.ApiUrl.IsNullOrEmpty())
+                if (propertyInfo.Type.IsEnum || !propertyInfo.LookupConfiguration.ApiUrl.IsNullOrEmpty())
                 {
                     <abp-select asp-for="Role.ExtraProperties[propertyInfo.Name]"
                                 label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
index 7d04787975..61bd05a603 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
@@ -29,12 +29,7 @@
 
                     @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<CreateModalModel.UserInfoViewModel>())
                     {
-                        if (propertyInfo.Type.IsEnum)
-                        {
-                            <abp-select asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
-                                        label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"></abp-select>
-                        }
-                        else if (!propertyInfo.LookupConfiguration.ApiUrl.IsNullOrEmpty())
+                        if (propertyInfo.Type.IsEnum || !propertyInfo.LookupConfiguration.ApiUrl.IsNullOrEmpty())
                         {
                             <abp-select asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
                                         label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
index d68011a3c2..a4c0c7081c 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml
@@ -31,12 +31,7 @@
 
                     @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<EditModalModel.UserInfoViewModel>())
                     {
-                        if (propertyInfo.Type.IsEnum)
-                        {
-                            <abp-select asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
-                                        label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"></abp-select>
-                        }
-                        else if (!propertyInfo.LookupConfiguration.ApiUrl.IsNullOrEmpty())
+                        if (propertyInfo.Type.IsEnum || !propertyInfo.LookupConfiguration.ApiUrl.IsNullOrEmpty())
                         {
                             <abp-select asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
                                         label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
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 8d7b8a22b3..067c98410a 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
@@ -24,12 +24,7 @@
 
             @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<CreateModalModel.TenantInfoModel>())
             {
-                if (propertyInfo.Type.IsEnum)
-                {
-                    <abp-select asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
-                                label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"></abp-select>
-                }
-                else if (!propertyInfo.LookupConfiguration.ApiUrl.IsNullOrEmpty())
+                if (propertyInfo.Type.IsEnum || !propertyInfo.LookupConfiguration.ApiUrl.IsNullOrEmpty())
                 {
                     <abp-select asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
                                 label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
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 6c03e60844..51be8c8079 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,12 +20,7 @@
             <abp-input asp-for="Tenant.Name" label="@L["TenantName"].Value" />
             @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<EditModalModel.TenantInfoModel>())
             {
-                if (propertyInfo.Type.IsEnum)
-                {
-                    <abp-select asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
-                                label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"></abp-select>
-                }
-                else if (!propertyInfo.LookupConfiguration.ApiUrl.IsNullOrEmpty())
+                if (propertyInfo.Type.IsEnum || !propertyInfo.LookupConfiguration.ApiUrl.IsNullOrEmpty())
                 {
                     <abp-select asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
                                 label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"