diff --git a/lisp/subr.el b/lisp/subr.el
index f92e78d9afb..9bea598b8a5 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -792,6 +792,7 @@ Optional DEFAULT is a default password to use instead of empty input."
 	      (message "Password not repeated accurately; please start over")
 	      (sit-for 1))))
 	success)
+    (clear-this-command-keys)
     (let ((pass nil)
 	  (c 0)
 	  (echo-keystrokes 0)