diff --git a/chk_rel.php b/chk_rel.php
index f34e8300d5..fe639537f9 100644
--- a/chk_rel.php
+++ b/chk_rel.php
@@ -13,20 +13,20 @@ require_once 'libraries/common.inc.php';
 $relation = new Relation();
 
 // If request for creating the pmadb
-if (isset($_REQUEST['create_pmadb'])) {
+if (isset($_POST['create_pmadb'])) {
     if ($relation->createPmaDatabase()) {
         $relation->fixPmaTables('phpmyadmin');
     }
 }
 
 // If request for creating all PMA tables.
-if (isset($_REQUEST['fixall_pmadb'])) {
+if (isset($_POST['fixall_pmadb'])) {
     $relation->fixPmaTables($GLOBALS['db']);
 }
 
 $cfgRelation = $relation->getRelationsParam();
 // If request for creating missing PMA tables.
-if (isset($_REQUEST['fix_pmadb'])) {
+if (isset($_POST['fix_pmadb'])) {
     $relation->fixPmaTables($cfgRelation['db']);
 }
 
diff --git a/db_operations.php b/db_operations.php
index f3ad40e892..c5e99783b5 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -298,7 +298,7 @@ if (!$is_information_schema) {
                 '%sFind out why%s.'
             )
         );
-        $message->addParamHtml('<a href="./chk_rel.php' . $url_query . '">');
+        $message->addParamHtml('<a href="./chk_rel.php" data-post="' . $url_query . '">');
         $message->addParamHtml('</a>');
         /* Show error if user has configured something, notice elsewhere */
         if (!empty($cfg['Servers'][$server]['pmadb'])) {
diff --git a/index.php b/index.php
index 30ec98c32d..e80ceef4c8 100644
--- a/index.php
+++ b/index.php
@@ -621,7 +621,7 @@ if ($server > 0) {
                 );
         }
         $msg = Message::notice($msg_text);
-        $msg->addParamHtml('<a href="./chk_rel.php' . $common_url_query . '">');
+        $msg->addParamHtml('<a href="./chk_rel.php" data-post="' . $common_url_query . '">');
         $msg->addParamHtml('</a>');
         /* Show error if user has configured something, notice elsewhere */
         if (!empty($cfg['Servers'][$server]['pmadb'])) {
diff --git a/libraries/classes/Relation.php b/libraries/classes/Relation.php
index 513e09e96d..75ff20a81d 100644
--- a/libraries/classes/Relation.php
+++ b/libraries/classes/Relation.php
@@ -1994,7 +1994,7 @@ class Relation
     {
         $retval = '';
 
-        $url_query = Url::getCommon(array('db' => $GLOBALS['db']));
+        $url_query = Url::getCommon(array('db' => $GLOBALS['db']), '');
         if ($allTables) {
             if ($createDb) {
                 $url_query .= '&amp;goto=db_operations.php&amp;create_pmadb=1';
@@ -2019,7 +2019,7 @@ class Relation
                 __('%sCreate%s missing phpMyAdmin configuration storage tables.')
             );
         }
-        $message->addParamHtml('<a href="./chk_rel.php' . $url_query . '">');
+        $message->addParamHtml('<a href="./chk_rel.php" data-post="' . $url_query . '">');
         $message->addParamHtml('</a>');
 
         $retval .= $message->getDisplay();