diff --git a/ChangeLog b/ChangeLog
index a903fae4d4..3dcd95a985 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog
 - issue #17424 Fix export limit size calculation
 - issue #17366 Fix refresh rate popup on Monitor page
 - issue #17577 Fix monitor charts size on RTL languages
+- issue #17121 Fix password_hash function incorrectly adding single quotes to password before hashing
 
 5.2.0 (2022-05-10)
 - issue #16521 Upgrade Bootstrap to version 5
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 610956e19f..d4b085d70a 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -5230,7 +5230,7 @@
     </RedundantPropertyInitializationCheck>
   </file>
   <file src="libraries/classes/Database/Routines.php">
-    <MixedArgument occurrences="71">
+    <MixedArgument occurrences="70">
       <code>$GLOBALS['errors']</code>
       <code>$_GET['item_name']</code>
       <code>$_GET['item_name']</code>
@@ -5258,7 +5258,6 @@
       <code>$_POST['item_type']</code>
       <code>$_REQUEST['item_name']</code>
       <code>$itemDefiner</code>
-      <code>$itemDefiner</code>
       <code>$itemName</code>
       <code>$itemParamOpsNum[$i]</code>
       <code>$itemParamOpsText[$i]</code>
@@ -5630,7 +5629,7 @@
     <InvalidReturnType occurrences="1">
       <code>int|bool</code>
     </InvalidReturnType>
-    <MixedArgument occurrences="49">
+    <MixedArgument occurrences="48">
       <code>$_SERVER['SCRIPT_NAME']</code>
       <code>$a</code>
       <code>$arrayKeys</code>
@@ -5639,7 +5638,6 @@
       <code>$databaseName</code>
       <code>$grant</code>
       <code>$grant</code>
-      <code>$grant</code>
       <code>$host</code>
       <code>$host</code>
       <code>$link</code>
@@ -5926,14 +5924,12 @@
       <code>$statementInfo-&gt;statement-&gt;expr</code>
       <code>$statementInfo-&gt;statement-&gt;where</code>
     </InvalidIterator>
-    <MixedArgument occurrences="44">
+    <MixedArgument occurrences="42">
       <code>$_SESSION['tmpval']['max_rows']</code>
       <code>$_SESSION['tmpval']['pos'] / $_SESSION['tmpval']['max_rows']</code>
       <code>$_SESSION['tmpval']['query']</code>
       <code>$_SESSION['tmpval']['query']</code>
       <code>$clause</code>
-      <code>$clause</code>
-      <code>$clause</code>
       <code>$clauseIsUnique</code>
       <code>$clauseIsUnique</code>
       <code>$colOrder</code>
@@ -6478,7 +6474,7 @@
       <code>$aliases[$dbName]['tables'][$tableName]</code>
       <code>$aliases[$dbName]['tables'][$tableName]</code>
     </MixedArrayOffset>
-    <MixedAssignment occurrences="26">
+    <MixedAssignment occurrences="25">
       <code>$GLOBALS['active_page']</code>
       <code>$GLOBALS['save_filename']</code>
       <code>$GLOBALS['time_start']</code>
@@ -6502,7 +6498,6 @@
       <code>$val2</code>
       <code>$val2</code>
       <code>$value</code>
-      <code>$value</code>
       <code>$view</code>
       <code>$views[]</code>
     </MixedAssignment>