diff --git a/ChangeLog b/ChangeLog
index acf03b98d5..44c4e8d616 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog
 
 4.3.2.0 (not yet released)
 - bug #4628 PHP error while exporting schema as PDF
+- bug #4631 Server selector submits two server parameter values
 
 4.3.1.0 (2014-12-08)
 - bug #4609 'Show all' checkbox label is not clickable
diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php
index 67829fe57c..db06332f36 100644
--- a/libraries/select_server.lib.php
+++ b/libraries/select_server.lib.php
@@ -32,7 +32,7 @@ function PMA_selectServer($not_only_options, $omit_fieldset)
     if ($not_only_options) {
         $retval .= '<form method="post" action="'
             . $GLOBALS['cfg']['DefaultTabServer'] . '" class="disableAjax">';
-        $retval .= PMA_URL_getHiddenInputs();
+        $retval .= PMA_getHiddenFields(array('token' => $_SESSION[' PMA_token ']));
 
         if (! $omit_fieldset) {
             $retval .= '<fieldset>';