diff --git a/framework/src/Volo.Abp.Emailing/Volo.Abp.Emailing.csproj b/framework/src/Volo.Abp.Emailing/Volo.Abp.Emailing.csproj
index aad33abfbc..1bd548e6c2 100644
--- a/framework/src/Volo.Abp.Emailing/Volo.Abp.Emailing.csproj
+++ b/framework/src/Volo.Abp.Emailing/Volo.Abp.Emailing.csproj
@@ -20,9 +20,6 @@
 
   <ItemGroup>
     <Content Remove="Volo\Abp\Emailing\Localization\*.json" />
-  </ItemGroup>
-
-  <ItemGroup>
     <EmbeddedResource Include="Volo\Abp\Emailing\Localization\*.json" />
   </ItemGroup>
 
diff --git a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/EmailSettingProvider.cs b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/EmailSettingProvider.cs
index 8e3ade25a9..0fb3402740 100644
--- a/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/EmailSettingProvider.cs
+++ b/framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/EmailSettingProvider.cs
@@ -13,17 +13,59 @@ namespace Volo.Abp.Emailing
         public override void Define(ISettingDefinitionContext context)
         {
             context.Add(
-                new SettingDefinition(EmailSettingNames.Smtp.Host, "127.0.0.1", L("DisplayName:Abp.Mailing.Smtp.Host"), L("Description:Abp.Mailing.Smtp.Host")),
-                new SettingDefinition(EmailSettingNames.Smtp.Port, "25", L("DisplayName:Abp.Mailing.Smtp.Port"), L("Description:Abp.Mailing.Smtp.Port")),
-                new SettingDefinition(EmailSettingNames.Smtp.UserName, displayName: L("DisplayName:Abp.Mailing.Smtp.UserName"), description: L("Description:Abp.Mailing.Smtp.UserName")),
-                new SettingDefinition(EmailSettingNames.Smtp.Password, displayName: L("DisplayName:Abp.Mailing.Smtp.Password"), description: L("Description:Abp.Mailing.Smtp.Password"), isEncrypted: true),
-                new SettingDefinition(EmailSettingNames.Smtp.Domain, displayName: L("DisplayName:Abp.Mailing.Smtp.Domain"), description: L("Description:Abp.Mailing.Smtp.Domain")),
-                new SettingDefinition(EmailSettingNames.Smtp.EnableSsl, "false", L("DisplayName:Abp.Mailing.Smtp.EnableSsl"), L("Description:Abp.Mailing.Smtp.EnableSsl")),
-                new SettingDefinition(EmailSettingNames.Smtp.UseDefaultCredentials, "true", L("DisplayName:Abp.Mailing.Smtp.UseDefaultCredentials"), L("Description:Abp.Mailing.Smtp.UseDefaultCredentials")),
-                new SettingDefinition(EmailSettingNames.DefaultFromAddress, "noreply@abp.io", L("DisplayName:Abp.Mailing.DefaultFromAddress"), L("Description:Abp.Mailing.DefaultFromAddress")),
-                new SettingDefinition(EmailSettingNames.DefaultFromDisplayName, "ABP application", L("DisplayName:Abp.Mailing.DefaultFromDisplayName"), L("Description:Abp.Mailing.DefaultFromDisplayName"))
+                new SettingDefinition(
+                    EmailSettingNames.Smtp.Host, 
+                    "127.0.0.1", 
+                    L("DisplayName:Abp.Mailing.Smtp.Host"), 
+                    L("Description:Abp.Mailing.Smtp.Host")),
+
+                new SettingDefinition(EmailSettingNames.Smtp.Port, 
+                    "25", 
+                    L("DisplayName:Abp.Mailing.Smtp.Port"), 
+                    L("Description:Abp.Mailing.Smtp.Port")),
+
+                new SettingDefinition(
+                    EmailSettingNames.Smtp.UserName, 
+                    displayName: L("DisplayName:Abp.Mailing.Smtp.UserName"), 
+                    description: L("Description:Abp.Mailing.Smtp.UserName")),
+
+                new SettingDefinition(
+                    EmailSettingNames.Smtp.Password, 
+                    displayName: 
+                    L("DisplayName:Abp.Mailing.Smtp.Password"), 
+                    description: L("Description:Abp.Mailing.Smtp.Password"), 
+                    isEncrypted: true),
+
+                new SettingDefinition(
+                    EmailSettingNames.Smtp.Domain, 
+                    displayName: L("DisplayName:Abp.Mailing.Smtp.Domain"), 
+                    description: L("Description:Abp.Mailing.Smtp.Domain")),
+
+                new SettingDefinition(
+                    EmailSettingNames.Smtp.EnableSsl, 
+                    "false",
+                    L("DisplayName:Abp.Mailing.Smtp.EnableSsl"), 
+                    L("Description:Abp.Mailing.Smtp.EnableSsl")),
+
+                new SettingDefinition(
+                    EmailSettingNames.Smtp.UseDefaultCredentials, 
+                    "true", 
+                    L("DisplayName:Abp.Mailing.Smtp.UseDefaultCredentials"), 
+                    L("Description:Abp.Mailing.Smtp.UseDefaultCredentials")),
+
+                new SettingDefinition(
+                    EmailSettingNames.DefaultFromAddress, 
+                    "noreply@abp.io", 
+                    L("DisplayName:Abp.Mailing.DefaultFromAddress"), 
+                    L("Description:Abp.Mailing.DefaultFromAddress")),
+
+                new SettingDefinition(EmailSettingNames.DefaultFromDisplayName, 
+                    "ABP application", 
+                    L("DisplayName:Abp.Mailing.DefaultFromDisplayName"),
+                    L("Description:Abp.Mailing.DefaultFromDisplayName"))
             );
         }
+
         private static LocalizableString L(string name)
         {
             return LocalizableString.Create<EmailingResource>(name);
diff --git a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LocalizationSettingProvider.cs b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LocalizationSettingProvider.cs
index 8b0ef51029..14afe69dac 100644
--- a/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LocalizationSettingProvider.cs
+++ b/framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LocalizationSettingProvider.cs
@@ -8,9 +8,14 @@ namespace Volo.Abp.Localization
         public override void Define(ISettingDefinitionContext context)
         {
             context.Add(
-                new SettingDefinition(LocalizationSettingNames.DefaultLanguage, "en", L("DisplayName:Abp.Localization.DefaultLanguage"), L("Description:Abp.Localization.DefaultLanguage"), isVisibleToClients: true)
+                new SettingDefinition(LocalizationSettingNames.DefaultLanguage,
+                    "en", 
+                    L("DisplayName:Abp.Localization.DefaultLanguage"),
+                    L("Description:Abp.Localization.DefaultLanguage"),
+                    isVisibleToClients: true)
             );
         }
+
         private static LocalizableString L(string name)
         {
             return LocalizableString.Create<AbpValidationResource>(name);
diff --git a/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingDefinitionProvider.cs b/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingDefinitionProvider.cs
index 1a613704f7..53c2df6fbd 100644
--- a/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingDefinitionProvider.cs
+++ b/modules/account/src/Volo.Abp.Account.Web/Settings/AccountSettingDefinitionProvider.cs
@@ -9,13 +9,22 @@ namespace Volo.Abp.Account.Web.Settings
         public override void Define(ISettingDefinitionContext context)
         {
             context.Add(
-                new SettingDefinition(AccountSettingNames.IsSelfRegistrationEnabled, "true", L("DisplayName:Abp.Account.IsSelfRegistrationEnabled"), L("Description:Abp.Account.IsSelfRegistrationEnabled"))
+                new SettingDefinition(
+                    AccountSettingNames.IsSelfRegistrationEnabled, 
+                    "true", 
+                    L("DisplayName:Abp.Account.IsSelfRegistrationEnabled"), 
+                    L("Description:Abp.Account.IsSelfRegistrationEnabled"))
             );
 
             context.Add(
-                new SettingDefinition(AccountSettingNames.EnableLocalLogin, "true", L("DisplayName:Abp.Account.EnableLocalLogin"), L("Description:Abp.Account.EnableLocalLogin"))
+                new SettingDefinition(
+                    AccountSettingNames.EnableLocalLogin, 
+                    "true", 
+                    L("DisplayName:Abp.Account.EnableLocalLogin"), 
+                    L("Description:Abp.Account.EnableLocalLogin"))
             );
         }
+
         private static LocalizableString L(string name)
         {
             return LocalizableString.Create<AccountResource>(name);
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentitySettingDefinitionProvider.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentitySettingDefinitionProvider.cs
index faf6c5b5dd..efae6e467a 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentitySettingDefinitionProvider.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/AbpIdentitySettingDefinitionProvider.cs
@@ -10,28 +10,91 @@ namespace Volo.Abp.Identity
         public override void Define(ISettingDefinitionContext context)
         {
             context.Add(
-                new SettingDefinition(IdentitySettingNames.Password.RequiredLength, 6.ToString(), L("DisplayName:Abp.Identity.Password.RequiredLength"), L("Description:Abp.Identity.Password.RequiredLength"), true),
-                new SettingDefinition(IdentitySettingNames.Password.RequiredUniqueChars, 1.ToString(), L("DisplayName:Abp.Identity.Password.RequiredUniqueChars"), L("Description:Abp.Identity.Password.RequiredUniqueChars"), true),
-                new SettingDefinition(IdentitySettingNames.Password.RequireNonAlphanumeric, true.ToString(), L("DisplayName:Abp.Identity.Password.RequireNonAlphanumeric"), L("Description:Abp.Identity.Password.RequireNonAlphanumeric"), true),
-                new SettingDefinition(IdentitySettingNames.Password.RequireLowercase, true.ToString(), L("DisplayName:Abp.Identity.Password.RequireLowercase"), L("Description:Abp.Identity.Password.RequireLowercase"), true),
-                new SettingDefinition(IdentitySettingNames.Password.RequireUppercase, true.ToString(), L("DisplayName:Abp.Identity.Password.RequireUppercase"), L("Description:Abp.Identity.Password.RequireUppercase"), true),
-                new SettingDefinition(IdentitySettingNames.Password.RequireDigit, true.ToString(), L("DisplayName:Abp.Identity.Password.RequireDigit"), L("Description:Abp.Identity.Password.RequireDigit"), true),
-
-                new SettingDefinition(IdentitySettingNames.Lockout.AllowedForNewUsers, true.ToString(), L("DisplayName:Abp.Identity.Lockout.AllowedForNewUsers"), L("Description:Abp.Identity.Lockout.AllowedForNewUsers"), true),
-                new SettingDefinition(IdentitySettingNames.Lockout.LockoutDuration, (5*60).ToString(), L("DisplayName:Abp.Identity.Lockout.LockoutDuration"), L("Description:Abp.Identity.Lockout.LockoutDuration"), true),
-                new SettingDefinition(IdentitySettingNames.Lockout.MaxFailedAccessAttempts, 5.ToString(), L("DisplayName:Abp.Identity.Lockout.MaxFailedAccessAttempts"), L("Description:Abp.Identity.Lockout.MaxFailedAccessAttempts"), true),
-
-                new SettingDefinition(IdentitySettingNames.SignIn.RequireConfirmedEmail, false.ToString(), L("DisplayName:Abp.Identity.SignIn.RequireConfirmedEmail"), L("Description:Abp.Identity.SignIn.RequireConfirmedEmail"), true),
-                new SettingDefinition(IdentitySettingNames.SignIn.RequireConfirmedPhoneNumber, false.ToString(), L("DisplayName:Abp.Identity.SignIn.RequireConfirmedPhoneNumber"), L("Description:Abp.Identity.SignIn.RequireConfirmedPhoneNumber"), true),
-
-                new SettingDefinition(IdentitySettingNames.User.IsUserNameUpdateEnabled, true.ToString(), L("DisplayName:Abp.Identity.User.IsUserNameUpdateEnabled"), L("Description:Abp.Identity.User.IsUserNameUpdateEnabled"), true),
-                new SettingDefinition(IdentitySettingNames.User.IsEmailUpdateEnabled, true.ToString(), L("DisplayName:Abp.Identity.User.IsEmailUpdateEnabled"), L("Description:Abp.Identity.User.IsEmailUpdateEnabled"), true)
+                new SettingDefinition(
+                    IdentitySettingNames.Password.RequiredLength, 
+                    6.ToString(), 
+                    L("DisplayName:Abp.Identity.Password.RequiredLength"), 
+                    L("Description:Abp.Identity.Password.RequiredLength"), 
+                    true),
+
+                new SettingDefinition(
+                    IdentitySettingNames.Password.RequiredUniqueChars, 
+                    1.ToString(), 
+                    L("DisplayName:Abp.Identity.Password.RequiredUniqueChars"), 
+                    L("Description:Abp.Identity.Password.RequiredUniqueChars"), 
+                    true),
+
+                new SettingDefinition(
+                    IdentitySettingNames.Password.RequireNonAlphanumeric, 
+                    true.ToString(), 
+                    L("DisplayName:Abp.Identity.Password.RequireNonAlphanumeric"), 
+                    L("Description:Abp.Identity.Password.RequireNonAlphanumeric"), 
+                    true),
+
+                new SettingDefinition(
+                    IdentitySettingNames.Password.RequireLowercase, 
+                    true.ToString(), L("DisplayName:Abp.Identity.Password.RequireLowercase"), 
+                    L("Description:Abp.Identity.Password.RequireLowercase"), 
+                    true),
+
+                new SettingDefinition(
+                    IdentitySettingNames.Password.RequireUppercase, 
+                    true.ToString(), L("DisplayName:Abp.Identity.Password.RequireUppercase"), 
+                    L("Description:Abp.Identity.Password.RequireUppercase"), 
+                    true),
+
+                new SettingDefinition(
+                    IdentitySettingNames.Password.RequireDigit, 
+                    true.ToString(), L("DisplayName:Abp.Identity.Password.RequireDigit"), 
+                    L("Description:Abp.Identity.Password.RequireDigit"), 
+                    true),
+
+                new SettingDefinition(
+                    IdentitySettingNames.Lockout.AllowedForNewUsers, 
+                    true.ToString(), L("DisplayName:Abp.Identity.Lockout.AllowedForNewUsers"), 
+                    L("Description:Abp.Identity.Lockout.AllowedForNewUsers"), 
+                    true),
+                    
+                new SettingDefinition(
+                    IdentitySettingNames.Lockout.LockoutDuration, 
+                    (5*60).ToString(), L("DisplayName:Abp.Identity.Lockout.LockoutDuration"), 
+                    L("Description:Abp.Identity.Lockout.LockoutDuration"), 
+                    true),
+
+                new SettingDefinition(
+                    IdentitySettingNames.Lockout.MaxFailedAccessAttempts, 
+                    5.ToString(), L("DisplayName:Abp.Identity.Lockout.MaxFailedAccessAttempts"), 
+                    L("Description:Abp.Identity.Lockout.MaxFailedAccessAttempts"), 
+                    true),
+
+                new SettingDefinition(
+                    IdentitySettingNames.SignIn.RequireConfirmedEmail, 
+                    false.ToString(), L("DisplayName:Abp.Identity.SignIn.RequireConfirmedEmail"), 
+                    L("Description:Abp.Identity.SignIn.RequireConfirmedEmail"), 
+                    true),
+                new SettingDefinition(
+                    IdentitySettingNames.SignIn.RequireConfirmedPhoneNumber, 
+                    false.ToString(), L("DisplayName:Abp.Identity.SignIn.RequireConfirmedPhoneNumber"), 
+                    L("Description:Abp.Identity.SignIn.RequireConfirmedPhoneNumber"), 
+                    true),
+
+                new SettingDefinition(
+                    IdentitySettingNames.User.IsUserNameUpdateEnabled, 
+                    true.ToString(), L("DisplayName:Abp.Identity.User.IsUserNameUpdateEnabled"), 
+                    L("Description:Abp.Identity.User.IsUserNameUpdateEnabled"), 
+                    true),
+
+                new SettingDefinition(
+                    IdentitySettingNames.User.IsEmailUpdateEnabled, 
+                    true.ToString(), L("DisplayName:Abp.Identity.User.IsEmailUpdateEnabled"), 
+                    L("Description:Abp.Identity.User.IsEmailUpdateEnabled"), 
+                    true)
             );
         }
+
         private static LocalizableString L(string name)
         {
             return LocalizableString.Create<IdentityResource>(name);
         }
-
     }
 }