diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
index 6360a2574..6c708ad77 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
@@ -362,7 +362,7 @@ namespace Orchard.Users.Controllers {
                 validate = false;
             }
             else {
-                if (userName.Length >= 255) {
+                if (userName.Length >= UserPart.MaxUserNameLength) {
                     ModelState.AddModelError("username", T("The username you provided is too long."));
                     validate = false;
                 }
@@ -372,7 +372,7 @@ namespace Orchard.Users.Controllers {
                 ModelState.AddModelError("email", T("You must specify an email address."));
                 validate = false;
             }
-            else if (email.Length >= 255) {
+            else if (email.Length >= UserPart.MaxEmailLength) {
                 ModelState.AddModelError("email", T("The email address you provided is too long."));
                 validate = false;
             }
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Models/UserPart.cs b/src/Orchard.Web/Modules/Orchard.Users/Models/UserPart.cs
index f3ab94fb4..784f97bbb 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Models/UserPart.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Models/UserPart.cs
@@ -7,6 +7,9 @@ namespace Orchard.Users.Models {
         public const string EmailPattern = 
             @"^(?![\.@])(""([^""\r\\]|\\[""\r\\])*""|([-a-z0-9!#$%&'*+/=?^_`{|}~]|(?<!\.)\.)*)(?<!\.)"
             + @"@([a-z0-9][\w-]*\.)+[a-z]{2,}$";
+        
+        public const int MaxUserNameLength = 255;
+        public const int MaxEmailLength = 255;
 
         public string UserName {
             get { return Retrieve(x => x.UserName); }