diff --git a/kpasswd/kpasswd.c b/kpasswd/kpasswd.c
index 1f9de7e84..4a04043bd 100644
--- a/kpasswd/kpasswd.c
+++ b/kpasswd/kpasswd.c
@@ -114,8 +114,10 @@ main (int argc, char **argv)
     switch (ret) {
     case 0:
 	break;
-    case KRB5KRB_AP_ERR_BAD_INTEGRITY:
-    case KRB5KRB_AP_ERR_MODIFIED:
+    case KRB5_LIBOS_PWDINTR :
+	return 1;
+    case KRB5KRB_AP_ERR_BAD_INTEGRITY :
+    case KRB5KRB_AP_ERR_MODIFIED :
 	krb5_errx(context, 1, "Password incorrect");
 	break;
     default:
diff --git a/kuser/kinit.c b/kuser/kinit.c
index b939e7fa8..3f5487d87 100644
--- a/kuser/kinit.c
+++ b/kuser/kinit.c
@@ -357,7 +357,7 @@ main (int argc, char **argv)
     switch(ret){
     case 0:
 	break;
-    case KRB5KDC_ERR_NONE: /* XXX hack in krb5_get_init_creds_password */
+    case KRB5_LIBOS_PWDINTR: /* don't print anything if it was just C-c:ed */
 	exit(1);
     case KRB5KRB_AP_ERR_BAD_INTEGRITY:
     case KRB5KRB_AP_ERR_MODIFIED: