diff --git a/ChangeLog b/ChangeLog
index fda81ec467..83cc20b34f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@ phpMyAdmin - ChangeLog
 - issue #13144 Do not show New as a database in database dropdown
 - issue #13130 Fixed handling of errors in AJAX requests
 - issue #13152 Fixed PHP error in case of invalid table preferences
+- issue #13154 Fixed PHP error on password change
 
 4.7.0 (2017-03-28)
 - patch #12233 [Display] Improve message when renaming database to same name
diff --git a/user_password.php b/user_password.php
index a108836d4f..bbdcc6af28 100644
--- a/user_password.php
+++ b/user_password.php
@@ -84,6 +84,7 @@ exit;
  */
 function PMA_getChangePassMessage($change_password_message, $sql_query = '')
 {
+    $response = Response::getInstance();
     if ($response->isAjax()) {
         /**
          * If in an Ajax request, we don't need to show the rest of the page