diff --git a/ChangeLog b/ChangeLog
index e3c1957440..877ae9386e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog
 - bug #4687 Designer breaks without configuration storage
 - bug #4686 Select elements flicker and selects something else
 - bug #4689 Setup tool creates "pma__favorites" incorrectly
+- bug #4685 Call to a member function isUserType() on a non-object
 
 4.3.5.0 (2015-01-05)
 - bug       Auto-configuration: tables were not created automatically
diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php
index a9f2b15afb..a4b537e8ab 100644
--- a/libraries/Menu.class.php
+++ b/libraries/Menu.class.php
@@ -507,13 +507,13 @@ class PMA_Menu
      */
     private function _getServerTabs()
     {
-        $is_superuser = isset($GLOBALS['dbi']) && $GLOBALS['dbi']->isSuperuser();
+        $is_superuser = $GLOBALS['dbi']->isSuperuser();
         $isCreateOrGrantUser = $GLOBALS['dbi']->isUserType('grant')
             || $GLOBALS['dbi']->isUserType('create');
         $binary_logs = null;
         $notDrizzle = ! defined('PMA_DRIZZLE')
             || (defined('PMA_DRIZZLE') && ! PMA_DRIZZLE);
-        if (isset($GLOBALS['dbi']) && $notDrizzle) {
+        if ($notDrizzle) {
             if (PMA_Util::cacheExists('binary_logs')) {
                 $binary_logs = PMA_Util::cacheGet('binary_logs');
             } else {
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index ff55609645..19e31135e7 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -1042,7 +1042,12 @@ if (! defined('PMA_MINIMUM_COMMON')) {
         }
         $_SESSION['tmpval']['previous_server'] = $GLOBALS['server'];
 
-    } // end server connecting
+    } else { // end server connecting
+        // No need to check for 'PMA_BYPASS_GET_INSTANCE' since this execution path
+        // applies only to initial login
+        $response = PMA_Response::getInstance();
+        $response->getFooter()->setMinimal();
+    }
 
     /**
      * check if profiling was requested and remember it