diff --git a/ChangeLog b/ChangeLog
index a1d30be91..d4c587908 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,8 @@ $Source$
       libraries/db_details_db_info.inc.php:
       bug #1518147, after displaying information_schema, displaying other
       dbs does not show size
+    * libraries/auth/config.auth.lib.php: bug #1477402, if default server fails
+      you cannot switch in config auth
 
 2006-07-06 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/select_server.lib.php, css/phpmyadmin.css.php:
diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php
index 34a008c6b..da86a4611 100644
--- a/libraries/auth/config.auth.lib.php
+++ b/libraries/auth/config.auth.lib.php
@@ -136,8 +136,17 @@ function PMA_auth_fails()
 ?>
         </td>
     </tr>
-</table>
 <?php
+    if (count($GLOBALS['cfg']['Servers']) > 1) {
+        // offer a chance to login to other servers if the current one failed
+        require_once('./libraries/select_server.lib.php');
+        echo '<tr>' . "\n";
+        echo ' <td>' . "\n";
+        PMA_select_server(TRUE, TRUE);
+        echo ' </td>' . "\n";
+        echo '</tr>' . "\n";
+    }
+    echo '</table>' . "\n";
     require_once('./libraries/footer.inc.php');
     return TRUE;
 } // end of the 'PMA_auth_fails()' function