diff --git a/src/Web/Grand.Web/Validators/Common/AddressValidator.cs b/src/Web/Grand.Web/Validators/Common/AddressValidator.cs
index 4160cb8f0..f63946dd9 100644
--- a/src/Web/Grand.Web/Validators/Common/AddressValidator.cs
+++ b/src/Web/Grand.Web/Validators/Common/AddressValidator.cs
@@ -58,35 +58,35 @@ public AddressValidator(
             }
             if (addressSettings.CompanyRequired && addressSettings.CompanyEnabled)
             {
-                RuleFor(x => x.Company).NotEmpty().WithMessage(translationService.GetResource("Account.Fields.Company.Required"));
+                RuleFor(x => x.Company).NotEmpty().WithMessage(translationService.GetResource("Address.Fields.Company.Required"));
             }
             if (addressSettings.VatNumberRequired && addressSettings.VatNumberEnabled)
             {
-                RuleFor(x => x.VatNumber).NotEmpty().WithMessage(translationService.GetResource("Account.Fields.VatNumber.Required"));
+                RuleFor(x => x.VatNumber).NotEmpty().WithMessage(translationService.GetResource("Address.Fields.VatNumber.Required"));
             }
             if (addressSettings.StreetAddressRequired && addressSettings.StreetAddressEnabled)
             {
-                RuleFor(x => x.Address1).NotEmpty().WithMessage(translationService.GetResource("Account.Fields.StreetAddress.Required"));
+                RuleFor(x => x.Address1).NotEmpty().WithMessage(translationService.GetResource("Address.Fields.StreetAddress.Required"));
             }
             if (addressSettings.StreetAddress2Required && addressSettings.StreetAddress2Enabled)
             {
-                RuleFor(x => x.Address2).NotEmpty().WithMessage(translationService.GetResource("Account.Fields.StreetAddress2.Required"));
+                RuleFor(x => x.Address2).NotEmpty().WithMessage(translationService.GetResource("Address.Fields.StreetAddress2.Required"));
             }
             if (addressSettings.ZipPostalCodeRequired && addressSettings.ZipPostalCodeEnabled)
             {
-                RuleFor(x => x.ZipPostalCode).NotEmpty().WithMessage(translationService.GetResource("Account.Fields.ZipPostalCode.Required"));
+                RuleFor(x => x.ZipPostalCode).NotEmpty().WithMessage(translationService.GetResource("Address.Fields.ZipPostalCode.Required"));
             }
             if (addressSettings.CityRequired && addressSettings.CityEnabled)
             {
-                RuleFor(x => x.City).NotEmpty().WithMessage(translationService.GetResource("Account.Fields.City.Required"));
+                RuleFor(x => x.City).NotEmpty().WithMessage(translationService.GetResource("Address.Fields.City.Required"));
             }
             if (addressSettings.PhoneRequired && addressSettings.PhoneEnabled)
             {
-                RuleFor(x => x.PhoneNumber).NotEmpty().WithMessage(translationService.GetResource("Account.Fields.Phone.Required"));
+                RuleFor(x => x.PhoneNumber).NotEmpty().WithMessage(translationService.GetResource("Address.Fields.Phone.Required"));
             }
             if (addressSettings.FaxRequired && addressSettings.FaxEnabled)
             {
-                RuleFor(x => x.FaxNumber).NotEmpty().WithMessage(translationService.GetResource("Account.Fields.Fax.Required"));
+                RuleFor(x => x.FaxNumber).NotEmpty().WithMessage(translationService.GetResource("Address.Fields.Fax.Required"));
             }
             RuleFor(x => x).CustomAsync(async (x, context, _) =>
             {