diff --git a/imp/lib/Application.php b/imp/lib/Application.php
index 8b680033dac..1a1b1e6b609 100644
--- a/imp/lib/Application.php
+++ b/imp/lib/Application.php
@@ -115,6 +115,12 @@ protected function _bootstrap()
             $injector->bindFactory($key, $val, 'create');
         }
 
+        /* Methods only available if admin config is set for this
+         * server/login. */
+        if (empty($injector->getInstance('IMP_Factory_Imap')->create()->config->admin)) {
+            $this->auth = array_diff($this->auth, array('add', 'list', 'remove'));
+        }
+
         /* Set exception handler to handle uncaught
          * Horde_Imap_Client_Exceptions. */
         set_exception_handler(array($this, 'exceptionHandler'));
@@ -127,19 +133,6 @@ protected function _authenticated()
         IMP_Auth::authenticateCallback();
     }
 
-    /**
-     */
-    protected function _init()
-    {
-        global $injector;
-
-        /* Methods only available if admin config is set for this
-         * server/login. */
-        if (empty($injector->getInstance('IMP_Factory_Imap')->create()->config->admin)) {
-            $this->auth = array_diff($this->auth, array('add', 'list', 'remove'));
-        }
-    }
-
     /**
      */
     public function logout()