diff --git a/plugins/modules/mysql_user.py b/plugins/modules/mysql_user.py
index 9299eaf..3c61f36 100644
--- a/plugins/modules/mysql_user.py
+++ b/plugins/modules/mysql_user.py
@@ -456,8 +456,13 @@ def main():
                                             priv, append_privs, subtract_privs, tls_requires, module)
                 else:
                     changed, msg = user_mod(cursor, user, host, host_all, None, encrypted,
+<<<<<<< HEAD
                                             plugin, plugin_hash_string, plugin_auth_string,
                                             priv, append_privs, subtract_privs, tls_requires, module)
+=======
+                                            None, None, None,
+                                            priv, append_privs, tls_requires, module)
+>>>>>>> mysql_user: prevent password getting set for existing users on on_create when plugin is used
 
             except (SQLParseError, InvalidPrivsError, mysql_driver.Error) as e:
                 module.fail_json(msg=to_native(e))