diff --git a/lib/kadm5/password_quality.c b/lib/kadm5/password_quality.c
index eb72ba618..ae3a6affe 100644
--- a/lib/kadm5/password_quality.c
+++ b/lib/kadm5/password_quality.c
@@ -91,7 +91,7 @@ char_class_passwd_quality (krb5_context context,
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZ",
 	"abcdefghijklmnopqrstuvwxyz",
 	"1234567890",
-	"!@#$%^&*()/?<>,.{[]}\\|'~`\" "
+	" !\"#$%&'()*+,-./:;<=>?@\\]^_`{|}~"
     };
     int counter = 0, req_classes;
     size_t i, len;
@@ -120,11 +120,12 @@ char_class_passwd_quality (krb5_context context,
     if (counter < req_classes) {
 	snprintf(message, length,
 	    "Password doesn't meet complexity requirement.\n"
-	    "Add more characters from the following classes:\n"
+	    "Add more characters from at least %d of the\n"
+            "following classes:\n"
 	    "1. English uppercase characters (A through Z)\n"
 	    "2. English lowercase characters (a through z)\n"
 	    "3. Base 10 digits (0 through 9)\n"
-	    "4. Nonalphanumeric characters (e.g., !, $, #, %%)");
+	    "4. Nonalphanumeric characters (e.g., !, $, #, %%)", req_classes);
 	return 1;
     }
     return 0;