diff --git a/library/Icinga/Application/DbAdapterFactory.php b/library/Icinga/Application/DbAdapterFactory.php
index e6b5d9f84..9c28f4950 100644
--- a/library/Icinga/Application/DbAdapterFactory.php
+++ b/library/Icinga/Application/DbAdapterFactory.php
@@ -211,12 +211,12 @@ class DbAdapterFactory implements ConfigAwareFactory
             throw new ConfigurationError($msg);
         }
         $options = array(
-            'dbname'         => $config->dbname,
-            'host'           => $config->host,
-            'username'       => $config->username,
-            'password'       => $config->password,
-            'options'        => self::$defaultZendDbAdapterOptions,
-            'driver_options' => self::$defaultPdoDriverOptions
+            'dbname'            => $config->dbname,
+            'host'              => $config->host,
+            'username'          => $config->username,
+            'password'          => $config->password,
+            'options'           => self::$defaultZendDbAdapterOptions,
+            'driver_options'    => self::$defaultPdoDriverOptions
         );
         switch ($config->db) {
             case 'mysql':
@@ -246,7 +246,7 @@ class DbAdapterFactory implements ConfigAwareFactory
     private static function callFactory($adapter, $options)
     {
         $factory = self::$factoryClass;
-        $optionModifierCallback = __CLASS__.  '::get' . ucfirst(str_replace('_', '', $adapter)) . 'Options';
+        $optionModifierCallback = __CLASS__ .  '::get' . ucfirst(str_replace('_', '', $adapter)) . 'Options';
         if (is_callable($optionModifierCallback)) {
             $options = call_user_func($optionModifierCallback, $options);
         }
diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 9a46a287c..ec3be7404 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -188,7 +188,7 @@ class Manager
     {
         $type = ucwords(strtolower($backendConfig->backend));
         if (!$type) {
-            Logger::warn('No type given...');
+            Logger::warn('Backend has no type configured. (e.g. backend=ldap)');
             return null;
         }
         try {
@@ -209,12 +209,13 @@ class Manager
     /**
      * Try to authenticate the current user with the Credentials (@see Credentials).
      *
-     * @param Credentials  $credentials        The credentials to use for authentication
-     * @param Boolean      $persist            Whether to persist the authentication result
-     *                                           in the current session
+     * @param   Credentials $credentials        The credentials to use for authentication
+     * @param   Boolean     $persist            Whether to persist the authentication result
+     *                                          in the current session
      *
-     * @return Boolean                         true on success, otherwise false
-     **/
+     * @return  Boolean                         true on success, otherwise false
+     * @throws  ConfigError
+     */
     public function authenticate(Credentials $credentials, $persist = true)
     {
         if (!$this->userBackend) {
diff --git a/library/Icinga/User/Preferences/DbStore.php b/library/Icinga/User/Preferences/DbStore.php
index 3e5b79a0c..8fee03561 100644
--- a/library/Icinga/User/Preferences/DbStore.php
+++ b/library/Icinga/User/Preferences/DbStore.php
@@ -93,7 +93,6 @@ class DbStore implements LoadInterface, FlushObserverInterface
     public function setDbAdapter(Zend_Db_Adapter_Abstract $db)
     {
         $this->db = $db;
-        $this->db->getProfiler()->setEnabled(true);
 
     }