diff --git a/src/Presentation/Nop.Web/Models/Customer/LoginModel.cs b/src/Presentation/Nop.Web/Models/Customer/LoginModel.cs
index 16f5a711c55..69ca729f7c9 100644
--- a/src/Presentation/Nop.Web/Models/Customer/LoginModel.cs
+++ b/src/Presentation/Nop.Web/Models/Customer/LoginModel.cs
@@ -23,6 +23,7 @@ public partial record LoginModel : BaseNopModel
 
     [DataType(DataType.Password)]
     [NoTrim]
+    [MaxLength(length: 1000)]
     [NopResourceDisplayName("Account.Login.Fields.Password")]
     public string Password { get; set; }
 
diff --git a/src/Presentation/Nop.Web/Models/Customer/RegisterModel.cs b/src/Presentation/Nop.Web/Models/Customer/RegisterModel.cs
index 5f39b6f01b0..1cae3da8a3a 100644
--- a/src/Presentation/Nop.Web/Models/Customer/RegisterModel.cs
+++ b/src/Presentation/Nop.Web/Models/Customer/RegisterModel.cs
@@ -11,11 +11,148 @@ public partial record RegisterModel : BaseNopModel
 {
     public RegisterModel()
     {
-        AvailableTimeZones = new List<SelectListItem>();
-        AvailableCountries = new List<SelectListItem>();
-        AvailableStates = new List<SelectListItem>();
-        CustomerAttributes = new List<CustomerAttributeModel>();
-        GdprConsents = new List<GdprConsentModel>();
+        public RegisterModel()
+        {
+            AvailableTimeZones = new List<SelectListItem>();
+            AvailableCountries = new List<SelectListItem>();
+            AvailableStates = new List<SelectListItem>();
+            CustomerAttributes = new List<CustomerAttributeModel>();
+            GdprConsents = new List<GdprConsentModel>();            
+        }
+
+        [DataType(DataType.EmailAddress)]
+        [NopResourceDisplayName("Account.Fields.Email")]
+        public string Email { get; set; }
+
+        public bool EnteringEmailTwice { get; set; }
+        [DataType(DataType.EmailAddress)]
+        [NopResourceDisplayName("Account.Fields.ConfirmEmail")]
+        public string ConfirmEmail { get; set; }
+
+        public bool UsernamesEnabled { get; set; }
+        [NopResourceDisplayName("Account.Fields.Username")]
+        public string Username { get; set; }
+
+        public bool CheckUsernameAvailabilityEnabled { get; set; }
+
+        [NoTrim]
+        [DataType(DataType.Password)]
+        [NopResourceDisplayName("Account.Fields.Password")]
+        [MaxLength(length: 1000)]
+        public string Password { get; set; }
+
+        [NoTrim]
+        [DataType(DataType.Password)]
+        [NopResourceDisplayName("Account.Fields.ConfirmPassword")]
+        public string ConfirmPassword { get; set; }
+
+        //form fields & properties
+        public bool GenderEnabled { get; set; }
+        [NopResourceDisplayName("Account.Fields.Gender")]
+        public string Gender { get; set; }
+
+        public bool NeutralGenderEnabled { get; set; }
+
+        public bool FirstNameEnabled { get; set; }
+        [NopResourceDisplayName("Account.Fields.FirstName")]
+        public string FirstName { get; set; }
+        public bool FirstNameRequired { get; set; }
+        public bool LastNameEnabled { get; set; }
+        [NopResourceDisplayName("Account.Fields.LastName")]
+        public string LastName { get; set; }
+        public bool LastNameRequired { get; set; }
+
+        public bool DateOfBirthEnabled { get; set; }
+        [NopResourceDisplayName("Account.Fields.DateOfBirth")]
+        public int? DateOfBirthDay { get; set; }
+        [NopResourceDisplayName("Account.Fields.DateOfBirth")]
+        public int? DateOfBirthMonth { get; set; }
+        [NopResourceDisplayName("Account.Fields.DateOfBirth")]
+        public int? DateOfBirthYear { get; set; }
+        public bool DateOfBirthRequired { get; set; }
+        public DateTime? ParseDateOfBirth()
+        {
+            return CommonHelper.ParseDate(DateOfBirthYear, DateOfBirthMonth, DateOfBirthDay);
+        }
+
+        public bool CompanyEnabled { get; set; }
+        public bool CompanyRequired { get; set; }
+        [NopResourceDisplayName("Account.Fields.Company")]
+        public string Company { get; set; }
+
+        public bool StreetAddressEnabled { get; set; }
+        public bool StreetAddressRequired { get; set; }
+        [NopResourceDisplayName("Account.Fields.StreetAddress")]
+        public string StreetAddress { get; set; }
+
+        public bool StreetAddress2Enabled { get; set; }
+        public bool StreetAddress2Required { get; set; }
+        [NopResourceDisplayName("Account.Fields.StreetAddress2")]
+        public string StreetAddress2 { get; set; }
+
+        public bool ZipPostalCodeEnabled { get; set; }
+        public bool ZipPostalCodeRequired { get; set; }
+        [NopResourceDisplayName("Account.Fields.ZipPostalCode")]
+        public string ZipPostalCode { get; set; }
+
+        public bool CityEnabled { get; set; }
+        public bool CityRequired { get; set; }
+        [NopResourceDisplayName("Account.Fields.City")]
+        public string City { get; set; }
+
+        public bool CountyEnabled { get; set; }
+        public bool CountyRequired { get; set; }
+        [NopResourceDisplayName("Account.Fields.County")]
+        public string County { get; set; }
+
+        public bool CountryEnabled { get; set; }
+        public bool CountryRequired { get; set; }
+        [NopResourceDisplayName("Account.Fields.Country")]
+        public int CountryId { get; set; }
+        public IList<SelectListItem> AvailableCountries { get; set; }
+        
+        public bool StateProvinceEnabled { get; set; }
+        public bool StateProvinceRequired { get; set; }
+        [NopResourceDisplayName("Account.Fields.StateProvince")]
+        public int StateProvinceId { get; set; }
+        public IList<SelectListItem> AvailableStates { get; set; }
+
+        public bool PhoneEnabled { get; set; }
+        public bool PhoneRequired { get; set; }
+        [DataType(DataType.PhoneNumber)]
+        [NopResourceDisplayName("Account.Fields.Phone")]
+        public string Phone { get; set; }
+
+        public bool FaxEnabled { get; set; }
+        public bool FaxRequired { get; set; }
+        [DataType(DataType.PhoneNumber)]
+        [NopResourceDisplayName("Account.Fields.Fax")]
+        public string Fax { get; set; }
+
+        public bool NewsletterEnabled { get; set; }
+        [NopResourceDisplayName("Account.Fields.Newsletter")]
+        public bool Newsletter { get; set; }
+
+        public bool AcceptPrivacyPolicyEnabled { get; set; }
+        public bool AcceptPrivacyPolicyPopup { get; set; }
+
+        //time zone
+        [NopResourceDisplayName("Account.Fields.TimeZone")]
+        public string TimeZoneId { get; set; }
+        public bool AllowCustomersToSetTimeZone { get; set; }
+        public IList<SelectListItem> AvailableTimeZones { get; set; }
+
+        //EU VAT
+        [NopResourceDisplayName("Account.Fields.VatNumber")]
+        public string VatNumber { get; set; }
+        public bool DisplayVatNumber { get; set; }
+
+        public bool HoneypotEnabled { get; set; }
+        public bool DisplayCaptcha { get; set; }
+
+        public IList<CustomerAttributeModel> CustomerAttributes { get; set; }
+
+        public IList<GdprConsentModel> GdprConsents { get; set; }
     }
 
     [DataType(DataType.EmailAddress)]