diff --git a/kadmin/kadmin.c b/kadmin/kadmin.c
index 7c4576752..538507476 100644
--- a/kadmin/kadmin.c
+++ b/kadmin/kadmin.c
@@ -277,7 +277,7 @@ main(int argc, char **argv)
     if (argc != 0) {
 	ret = sl_command (commands, argc, argv);
 	if(ret == -1)
-	    krb5_warnx (context, "unrecognized command: %s", argv[0]);
+	    sl_did_you_mean(commands, argv[0]);
 	else if (ret == -2)
 	    ret = 0;
 	if(ret != 0)
diff --git a/lib/sl/sl.c b/lib/sl/sl.c
index ffab0175e..fb05cfe87 100644
--- a/lib/sl/sl.c
+++ b/lib/sl/sl.c
@@ -330,7 +330,7 @@ sl_command_loop(SL_cmd *cmds, const char *prompt, void **data)
     if (argc >= 1) {
 	ret = sl_command(cmds, argc, argv);
 	if(ret == -1) {
-	    printf ("Unrecognized command: %s\n", argv[0]);
+	    sl_did_you_mean(cmds, argv[0]);
 	    ret = 0;
 	}
     }