diff --git a/res/values/strings.xml b/res/values/strings.xml
index b8bd7b1d75c..228504e6348 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -781,9 +781,9 @@
     <string name="lockpassword_continue_label">Continue</string>
 
     <!-- Error shown in popup when password is too long -->
-    <string name="lockpassword_password_too_long">PIN can be no longer than %d digits</string>
+    <string name="lockpassword_password_too_long">Password must be fewer than <xliff:g id="number" example="17">%d</xliff:g> characters</string>
     <!-- Error shown in popup when PIN is too long -->
-    <string name="lockpassword_pin_too_long">PIN can be no longer than %d digits</string>
+    <string name="lockpassword_pin_too_long">PIN must be fewer than <xliff:g id="number" example="17">%d</xliff:g> digits</string>
 
     <!-- Error shown when in PIN mode and user enters a non-digit -->
     <string name="lockpassword_pin_contains_non_digits">PIN must contain only digits 0-9</string>
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index 018dfd2aa47..a0f23465ec1 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -274,7 +274,7 @@ public class ChooseLockPassword extends PreferenceActivity {
             if (password.length() > mPasswordMaxLength) {
                 return getString(mIsAlphaMode ?
                         R.string.lockpassword_password_too_long
-                        : R.string.lockpassword_pin_too_long, mPasswordMaxLength);
+                        : R.string.lockpassword_pin_too_long, mPasswordMaxLength + 1);
             }
             int letters = 0;
             int numbers = 0;