diff --git a/user_password.php b/user_password.php
index d4322c9c83..08cd45d750 100644
--- a/user_password.php
+++ b/user_password.php
@@ -174,10 +174,9 @@ function PMA_ChangePassUrlParamsAndSubmitQuery(
     $local_query = 'SET password = ' . (($password == '')
         ? '\'\''
         : $hashing_function . '(\'' . PMA_Util::sqlAddSlashes($password) . '\')');
-    $result = @PMA_DBI_try_query($local_query)
-            or PMA_Util::mysqlDie(
-                PMA_DBI_getError(), $sql_query, false, $err_url
-            );
+    if (! @PMA_DBI_try_query($local_query)) {
+        PMA_Util::mysqlDie(PMA_DBI_getError(), $sql_query, false, $err_url);
+    }
 }
 
 /**