diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 59dea2f91..932838580 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -284,7 +284,9 @@ if (top != self) {
     if (! empty($GLOBALS['table'])) {
         $_form_params['table'] = $GLOBALS['table'];
     }
-    echo PMA_generate_common_hidden_inputs();
+    // do not generate a "server" hidden field as we want the "server"
+    // drop-down to have priority
+    echo PMA_generate_common_hidden_inputs($_form_params, '', 0, 'server');
     ?>
     </fieldset>
 </form>
diff --git a/libraries/url_generating.lib.php b/libraries/url_generating.lib.php
index ac4c3e738..7c5a3abfd 100644
--- a/libraries/url_generating.lib.php
+++ b/libraries/url_generating.lib.php
@@ -12,8 +12,11 @@
  * @see     PMA_generate_common_url()
  * @uses    PMA_getHiddenFields
  * @param   string   optional database name
+ *                   (can also be an array of parameters)
  * @param   string   optional table name
  * @param   int      indenting level
+ * @param   string   do not generate a hidden field for this parameter
+ *                  (can be an array of strings) 
  *
  * @return  string   string with input fields
  *