diff --git a/mysql-test/main/failed_auth_unixsocket.result b/mysql-test/main/failed_auth_unixsocket.result
index 7e8b8fe70b9..084eb2fab64 100644
--- a/mysql-test/main/failed_auth_unixsocket.result
+++ b/mysql-test/main/failed_auth_unixsocket.result
@@ -8,3 +8,11 @@ ERROR 28000: Access denied for user 'USER'@'localhost'
 replace mysql.global_priv select * from global_priv_backup;
 flush privileges;
 drop table global_priv_backup;
+#
+# MDEV-18151: Skipped error returning for GRANT/SET PASSWORD
+#
+CREATE USER foo;
+GRANT EXECUTE ON * TO foo IDENTIFIED WITH unix_socket AS PASSWORD('bar');
+ERROR HY000: SET PASSWORD is not applicable for users authenticating via unix_socket plugin
+DROP USER foo;
+# End of 10.5 tests
diff --git a/mysql-test/main/failed_auth_unixsocket.test b/mysql-test/main/failed_auth_unixsocket.test
index fe80d947036..5a77e1cdbda 100644
--- a/mysql-test/main/failed_auth_unixsocket.test
+++ b/mysql-test/main/failed_auth_unixsocket.test
@@ -27,3 +27,17 @@ change_user $USER;
 replace mysql.global_priv select * from global_priv_backup;
 flush privileges;
 drop table global_priv_backup;
+
+
+--echo #
+--echo # MDEV-18151: Skipped error returning for GRANT/SET PASSWORD
+--echo #
+
+CREATE USER foo;
+--error ER_SET_PASSWORD_AUTH_PLUGIN
+GRANT EXECUTE ON * TO foo IDENTIFIED WITH unix_socket AS PASSWORD('bar');
+
+# Cleanup
+DROP USER foo;
+
+--echo # End of 10.5 tests
diff --git a/mysql-test/suite/plugins/r/multiauth.result b/mysql-test/suite/plugins/r/multiauth.result
index 07238b0940d..e002172073e 100644
--- a/mysql-test/suite/plugins/r/multiauth.result
+++ b/mysql-test/suite/plugins/r/multiauth.result
@@ -139,13 +139,13 @@ show create user mysqltest1;
 CREATE USER for mysqltest1@%
 CREATE USER `mysqltest1`@`%` IDENTIFIED VIA unix_socket OR mysql_native_password USING '*BFE3F4604CFD21E6595080A261D92EF0183B5971'
 set password for mysqltest1 = password('foobar');
-ERROR HY000: SET PASSWORD is ignored for users authenticating via unix_socket plugin
+ERROR HY000: SET PASSWORD is not applicable for users authenticating via unix_socket plugin
 show create user mysqltest1;
 CREATE USER for mysqltest1@%
 CREATE USER `mysqltest1`@`%` IDENTIFIED VIA unix_socket OR mysql_native_password USING '*9B500343BC52E2911172EB52AE5CF4847604C6E5'
 alter user mysqltest1 identified via unix_socket;
 set password for mysqltest1 = password('bla');
-ERROR HY000: SET PASSWORD is ignored for users authenticating via unix_socket plugin
+ERROR HY000: SET PASSWORD is not applicable for users authenticating via unix_socket plugin
 alter user mysqltest1 identified via mysql_native_password as password("some") or unix_socket;
 show create user mysqltest1;
 CREATE USER for mysqltest1@%
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 13642a62c73..96bdb38f335 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -7235,8 +7235,8 @@ ER_ACCESS_DENIED_NO_PASSWORD_ERROR 28000
         ukr "Доступ заборонено для користувача: '%s'@'%s'"
 
 ER_SET_PASSWORD_AUTH_PLUGIN
-        chi "通过%s插件验证的用户忽略SET PASSWORD"
-        eng "SET PASSWORD is ignored for users authenticating via %s plugin"
+        eng "SET PASSWORD is not applicable for users authenticating via %s plugin"
+        ukr "SET PASSWORD не можна застосувати для користувачів, що автентифікуються з допомогою плагінy %s"
 
 ER_GRANT_PLUGIN_USER_EXISTS
         chi "由于用户%-.*s已经存在，GRANT IDENTIFIED WITH授权是非法的"