diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Annotations/SetupValidationAttributes.cs b/src/Orchard.Web/Modules/Orchard.Setup/Annotations/SetupValidationAttributes.cs
index 3f91ed9de..61de3c4a8 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Annotations/SetupValidationAttributes.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Annotations/SetupValidationAttributes.cs
@@ -44,7 +44,7 @@ namespace Orchard.Setup.Annotations {
                 return T("User name is required.").Text;
 
             return _value.Length < (int)Minimum
-                ? T("User name must be longer than {0} characters.", Minimum).Text
+                ? T("User name must be at least {0} characters.", Minimum).Text
                 : T("User name can be no longer than {0} characters.", Maximum).Text;
         }
     }
@@ -68,8 +68,8 @@ namespace Orchard.Setup.Annotations {
             if (string.IsNullOrEmpty(_value))
                 return T("Password is required.").Text;
 
-            return _value.Length < (int)Minimum
-                ? T("Password must be longer than {0} characters.", Minimum).Text
+            return _value.Length < (int)Minimum
+                ? T("Password must be at least {0} characters.", Minimum).Text
                 : T("Password can be no longer than {0} characters.", Maximum).Text;
         }
     }