diff --git a/mysql-test/r/change_user_notembedded.result b/mysql-test/r/change_user_notembedded.result
index 506a463d6d2..60579d15ec2 100644
--- a/mysql-test/r/change_user_notembedded.result
+++ b/mysql-test/r/change_user_notembedded.result
@@ -1,5 +1,5 @@
+ERROR 28000: Access denied for user 'foo'@'localhost' (using password: YES)
 ERROR 28000: Access denied for user 'foo'@'localhost' (using password: NO)
-ERROR 28000: Access denied for user 'foo'@'localhost' (using password: NO)
-ERROR 28000: Access denied for user 'foo'@'localhost' (using password: NO)
+ERROR 28000: Access denied for user 'foo'@'localhost' (using password: YES)
 ERROR 08S01: Unknown command
 ERROR 08S01: Unknown command
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 1005f5d8688..547572c5db6 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -7471,6 +7471,7 @@ static bool parse_com_change_user_packet(MPVIO_EXT *mpvio, uint packet_length)
   }
 
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
+  thd->password= passwd_len > 0;
   if (find_mpvio_user(mpvio, sctx))
     return 1;