diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 7d795a480a..ee4bba0fd0 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -872,7 +872,9 @@ if (! defined('PMA_MINIMUM_COMMON')) {
 
         if (! $auth_plugin->authCheck()) {
             /* Force generating of new session on login */
-            PMA_secureSession();
+            if ($token_provided) {
+                PMA_secureSession();
+            }
             $auth_plugin->auth();
         } else {
             $auth_plugin->authSetUser();
diff --git a/libraries/select_server.lib.php b/libraries/select_server.lib.php
index 1fe4d691f5..7f5d6fed65 100644
--- a/libraries/select_server.lib.php
+++ b/libraries/select_server.lib.php
@@ -35,7 +35,6 @@ function PMA_selectServer($not_only_options, $omit_fieldset)
                 $GLOBALS['cfg']['DefaultTabServer'], 'server'
             )
             . '" class="disableAjax">';
-        $retval .= PMA_getHiddenFields(array('token' => $_SESSION[' PMA_token ']));
 
         if (! $omit_fieldset) {
             $retval .= '<fieldset>';
diff --git a/test/libraries/PMA_select_server_test.php b/test/libraries/PMA_select_server_test.php
index 564084d342..f7700bf1a6 100644
--- a/test/libraries/PMA_select_server_test.php
+++ b/test/libraries/PMA_select_server_test.php
@@ -125,12 +125,6 @@ class PMA_SelectServer_Test extends PHPUnit_Framework_TestCase
             $html
         );
 
-        //PMA_URL_getHiddenInputs
-        $this->assertContains(
-            '<input type="hidden" name="token" value="token" />',
-            $html
-        );
-
         //labels
         $this->assertContains(
             __('Current Server:'),