diff --git a/ChangeLog b/ChangeLog
index f3057ab388..9419c1f3eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
 
 4.5.5.0 (not yet released)
 - issue        Undefined index: is_ajax_request
+- issue #11855 Fix password change on MariaDB 10.1 and newer
 
 4.5.4.0 (not yet released)
 - issue #11724 live data edit of big sets is not working
diff --git a/user_password.php b/user_password.php
index 93149947bb..30940f4cbf 100644
--- a/user_password.php
+++ b/user_password.php
@@ -210,7 +210,7 @@ function PMA_changePassHashingFunction()
 }
 
 /**
- * Generate the error url and submit the query
+ * Changes password for a user
  *
  * @param string $username              Username
  * @param string $hostname              Hostname
@@ -235,6 +235,7 @@ function PMA_changePassUrlParamsAndSubmitQuery(
             : '\'' . PMA_Util::sqlAddSlashes($password) . '\'');
     } else if ($serverType == 'MariaDB'
         && PMA_MYSQL_INT_VERSION >= 50200
+        && PMA_MYSQL_INT_VERSION < 100100
     ) {
         if ($orig_auth_plugin == 'mysql_native_password') {
             // Set the hashing method used by PASSWORD()