diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
index bcce49bc5..9936dc825 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
@@ -358,11 +358,21 @@ namespace Orchard.Users.Controllers {
                 ModelState.AddModelError("username", T("You must specify a username."));
                 validate = false;
             }
+            else {
+                if (userName.Length >= 255) {
+                    ModelState.AddModelError("username", T("The username you provided is too long."));
+                    validate = false;
+                }
+            }
 
             if (String.IsNullOrEmpty(email)) {
                 ModelState.AddModelError("email", T("You must specify an email address."));
                 validate = false;
             }
+            else if (email.Length >= 255) {
+                ModelState.AddModelError("email", T("The email address you provided is too long."));
+                validate = false;
+            }
             else if (!Regex.IsMatch(email, UserPart.EmailPattern, RegexOptions.IgnoreCase)) {
                 // http://haacked.com/archive/2007/08/21/i-knew-how-to-validate-an-email-address-until-i.aspx    
                 ModelState.AddModelError("email", T("You must specify a valid email address."));