diff --git a/ChangeLog b/ChangeLog
index 0d14b3d50..4471b0cfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -70,6 +70,9 @@ danbarry
 + [doc] Documentation for distributing phpMyAdmin in README.VENDOR.
 + [display] headwords for sorted column 
 
+2.11.9.0 (not yet released)
+- bug #2031221 [auth] Links to version number on login screen 
+
 2.11.8.0 (2008-07-28)
 - patch #1987593 [interface] Table list pagination in navi, 
   thanks to Jason Day - jday29
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 302b90c47..934eade98 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -199,7 +199,8 @@ if (top != self) {
     // Displays the languages form
     if (empty($GLOBALS['cfg']['Lang'])) {
         require_once './libraries/display_select_lang.lib.php';
-        PMA_select_language(true);
+        // use fieldset, don't show doc link
+        PMA_select_language(true, false);
     }
 
     // Displays the warning message and the login form
@@ -251,14 +252,8 @@ if (top != self) {
     <legend>
 <?php
     echo $GLOBALS['strLogin'];
-    echo '<a href="./Documentation.html" target="documentation" ' .
-        'title="' . $GLOBALS['strPmaDocumentation'] . '">';
-    if ($GLOBALS['cfg']['ReplaceHelpImg']) {
-        echo '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . $GLOBALS['strPmaDocumentation'] . '" />';
-    } else {
-        echo '(*)';
-    }
-    echo '</a>';
+    // no real need to put a link to doc here, and it would reveal the
+    // version number
 ?>
 </legend>
 
diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php
index cdcf3c05b..a7a1f84be 100644
--- a/libraries/display_select_lang.lib.php
+++ b/libraries/display_select_lang.lib.php
@@ -26,7 +26,7 @@ function PMA_language_cmp(&$a, &$b) {
  *
  * @access  public
  */
-function PMA_select_language($use_fieldset = FALSE) {
+function PMA_select_language($use_fieldset = FALSE, $show_doc = TRUE) {
     global $cfg, $lang;
     ?>
 
@@ -42,11 +42,13 @@ function PMA_select_language($use_fieldset = FALSE) {
     // not a proper word in the current language; we show it to help
     // people recognize the dialog
     $language_title = $GLOBALS['strLanguage']
-        . ($GLOBALS['strLanguage'] != 'Language' ? ' - <em>Language</em>' : '')
-        . ' <a href="./translators.html" target="documentation">' .
+        . ($GLOBALS['strLanguage'] != 'Language' ? ' - <em>Language</em>' : '');
+    if ($show_doc) {
+        $language_title .= ' <a href="./translators.html" target="documentation">' .
             ($cfg['ReplaceHelpImg']
                 ? '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_info.png" width="11" height="11" alt="Info" />'
                 : '(*)') . '</a>';
+    }
     if ($use_fieldset) {
         echo '<fieldset><legend xml:lang="en" dir="ltr">' . $language_title . '</legend>';
     } else {