diff --git a/ChangeLog b/ChangeLog
index 11a0f4135..78c9e8703 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,9 @@ $Source$
 
 2005-11-20 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/common.lib.php::PMA_showMySQLDocu()
-      - prevent undefined constants (if server connection fails)
+      - undefined constant (if server connection fails)
+    * libraries/select_theme.lib.php
+      - undefined variable (if server connection fails)
 
 2005-11-18 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/database_interface.lib.php: initialize in case there are
diff --git a/libraries/select_theme.lib.php b/libraries/select_theme.lib.php
index 267242ac5..71cd7160b 100644
--- a/libraries/select_theme.lib.php
+++ b/libraries/select_theme.lib.php
@@ -79,7 +79,7 @@ if ($PMA_ThemeAvailable == TRUE) { // themeManager is available
 
 // Allow different theme per server
 $theme_cookie_name = 'pma_theme';
-if ($GLOBALS['cfg']['ThemePerServer']) {
+if ( isset( $server ) && $GLOBALS['cfg']['ThemePerServer'] ) {
     $theme_cookie_name .= '-' . $server;
 }