diff --git a/application/controllers/PreferenceController.php b/application/controllers/PreferenceController.php
index ac67f495b..a466ed48f 100644
--- a/application/controllers/PreferenceController.php
+++ b/application/controllers/PreferenceController.php
@@ -6,6 +6,7 @@ use Icinga\Web\Url;
 use Icinga\Web\Widget\Tab;
 use Icinga\Application\Config;
 use Icinga\Forms\PreferenceForm;
+use Icinga\Data\ConfigObject;
 use Icinga\User\Preferences\PreferencesStore;
 
 /**
@@ -38,13 +39,16 @@ class PreferenceController extends BasePreferenceController
      */
     public function indexAction()
     {
-        $storeConfig = Config::app()->getSection('preferences');
-
+        $config = Config::app()->getSection('global');
         $user = $this->getRequest()->getUser();
+
         $form = new PreferenceForm();
         $form->setPreferences($user->getPreferences());
-        if ($storeConfig->get('store', 'ini') !== 'none') {
-            $form->setStore(PreferencesStore::create($storeConfig, $user));
+        if ($config->get('config_backend', 'ini') !== 'none') {
+            $form->setStore(PreferencesStore::create(new ConfigObject(array(
+                'store'     => $config->get('config_backend', 'ini'),
+                'resource'  => $config->config_resource
+            )), $user));
         }
         $form->handleRequest();
 
diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php
index 64f8855c8..618178344 100644
--- a/application/forms/Config/General/ApplicationConfigForm.php
+++ b/application/forms/Config/General/ApplicationConfigForm.php
@@ -7,7 +7,6 @@ use Icinga\Application\Icinga;
 use Icinga\Data\ResourceFactory;
 use Icinga\Web\Form;
 
-
 /**
  * Form class to modify the general application configuration
  */
@@ -43,7 +42,7 @@ class ApplicationConfigForm extends Form
 
         $this->addElement(
             'select',
-            'preferences_store',
+            'global_config_backend',
             array(
                 'required'      => true,
                 'autosubmit'    => true,
@@ -55,7 +54,7 @@ class ApplicationConfigForm extends Form
                 )
             )
         );
-        if (isset($formData['preferences_store']) && $formData['preferences_store'] === 'db') {
+        if (isset($formData['global_config_backend']) && $formData['global_config_backend'] === 'db') {
             $backends = array();
             foreach (ResourceFactory::getResourceConfigs()->toArray() as $name => $resource) {
                 if ($resource['type'] === 'db') {
@@ -65,7 +64,7 @@ class ApplicationConfigForm extends Form
 
             $this->addElement(
                 'select',
-                'preferences_resource',
+                'global_config_resource',
                 array(
                     'required'      => true,
                     'multiOptions'  => $backends,
diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index fed012ab5..01173330a 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -6,6 +6,7 @@ namespace Icinga\Authentication;
 use Exception;
 use Icinga\Authentication\UserGroup\UserGroupBackend;
 use Icinga\Application\Config;
+use Icinga\Data\ConfigObject;
 use Icinga\Exception\IcingaException;
 use Icinga\Exception\NotReadableError;
 use Icinga\Application\Logger;
@@ -63,8 +64,11 @@ class Manager
             );
             $config = new Config();
         }
-        if ($config->get('preferences', 'store', 'ini') !== 'none') {
-            $preferencesConfig = $config->getSection('preferences');
+        if ($config->get('global', 'config_backend', 'ini') !== 'none') {
+            $preferencesConfig = new ConfigObject(array(
+                'store'     => $config->get('global', 'config_backend', 'ini'),
+                'resource'  => $config->get('global', 'config_resource')
+            ));
             try {
                 $preferencesStore = PreferencesStore::create(
                     $preferencesConfig,
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 679091fde..e2ee66d0a 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -39,26 +39,19 @@ class Form extends Zend_Form
     const DEFAULT_SUFFIX = '_default';
 
     /**
-     * The type of the notification for the error
+     * Identifier for notifications of type error
      */
-    const NOTIFICATION_ERROR    = 0;
+    const NOTIFICATION_ERROR = 0;
 
     /**
-     * The type of the notification for the warning
+     * Identifier for notifications of type warning
      */
-    const NOTIFICATION_WARNING  = 2;
+    const NOTIFICATION_WARNING = 1;
 
     /**
-     * The type of the notification for the info
+     * Identifier for notifications of type info
      */
-    const NOTIFICATION_INFO     = 4;
-
-    /**
-     * The notifications of the form
-     *
-     * @var array
-     */
-    protected $notifications = array();
+    const NOTIFICATION_INFO = 2;
 
     /**
      * Whether this form has been created
@@ -160,6 +153,13 @@ class Form extends Zend_Form
      */
     protected $descriptions;
 
+    /**
+     * The notifications of this form
+     *
+     * @var array
+     */
+    protected $notifications;
+
     /**
      * Whether the Autosubmit decorator should be applied to this form
      *
@@ -522,6 +522,50 @@ class Form extends Zend_Form
         return $this->descriptions;
     }
 
+    /**
+     * Set the notifications for this form
+     *
+     * @param   array   $notifications
+     *
+     * @return  $this
+     */
+    public function setNotifications(array $notifications)
+    {
+        $this->notifications = $notifications;
+        return $this;
+    }
+
+    /**
+     * Add a notification for this form
+     *
+     * If $notification is an array the second value should be
+     * an array as well containing additional HTML properties.
+     *
+     * @param   string|array    $notification
+     * @param   int             $type
+     *
+     * @return  $this
+     */
+    public function addNotification($notification, $type)
+    {
+        $this->notifications[$type][] = $notification;
+        return $this;
+    }
+
+    /**
+     * Return the notifications of this form
+     *
+     * @return  array
+     */
+    public function getNotifications()
+    {
+        if ($this->notifications === null) {
+            return array();
+        }
+
+        return $this->notifications;
+    }
+
     /**
      * Set whether the Autosubmit decorator should be applied to this form
      *
@@ -1264,55 +1308,48 @@ class Form extends Zend_Form
     }
 
     /**
-     * Return all form notifications
+     * Add a error notification and prevent the form from being successfully validated
      *
-     * @return array
-     */
-    public function getNotifications()
-    {
-        return $this->notifications;
-    }
-
-    /**
-     * Add a typed message to the notifications
+     * @param   string|array    $message    The notfication's message
      *
-     * @param string    $message    The message which would be displayed to the user
-     *
-     * @param int       $type       The type of the message notification
-     */
-    public function addNotification($message, $type = self::NOTIFICATION_ERROR)
-    {
-        $this->notifications[$message] = $type;
-        $this->markAsError();
-    }
-
-    /**
-     * Add a error message to notifications
-     *
-     * @param string $message
+     * @return  $this
      */
     public function error($message)
     {
-        $this->addNotification($message, $type = self::NOTIFICATION_ERROR);
+        $this->addNotification($message, self::NOTIFICATION_ERROR);
+        $this->markAsError();
+        return $this;
     }
 
     /**
-     * Add a warning message to notifications
+     * Add a warning notification and prevent the form from being successfully validated
      *
-     * @param string $message
+     * @param   string|array    $message    The notfication's message
+     *
+     * @return  $this
      */
     public function warning($message)
     {
-        $this->addNotification($message, $type = self::NOTIFICATION_WARNING);
+        $this->addNotification($message, self::NOTIFICATION_WARNING);
+        $this->markAsError();
+        return $this;
     }
 
     /**
-     * Add a info message to notifications
+     * Add a info notification
      *
-     * @param string $message
+     * @param   string|array    $message        The notfication's message
+     * @param   bool            $markAsError    Whether to prevent the form from being successfully validated or not
+     *
+     * @return  $this
      */
-    public function info($message)
+    public function info($message, $markAsError = true)
     {
-        $this->addNotification($message, $type = self::NOTIFICATION_INFO);
+        $this->addNotification($message, self::NOTIFICATION_INFO);
+        if ($markAsError) {
+            $this->markAsError();
+        }
+
+        return $this;
     }
 }
diff --git a/library/Icinga/Web/Form/Decorator/FormNotifications.php b/library/Icinga/Web/Form/Decorator/FormNotifications.php
index ed725e625..935c0ce41 100644
--- a/library/Icinga/Web/Form/Decorator/FormNotifications.php
+++ b/library/Icinga/Web/Form/Decorator/FormNotifications.php
@@ -4,15 +4,16 @@
 namespace Icinga\Web\Form\Decorator;
 
 use Zend_Form_Decorator_Abstract;
-use Icinga\Web\Form as Form;
+use Icinga\Exception\ProgrammingError;
+use Icinga\Web\Form;
 
 /**
- * Decorator to add a list of notifications at the top of a form
+ * Decorator to add a list of notifications at the top or bottom of a form
  */
 class FormNotifications extends Zend_Form_Decorator_Abstract
 {
     /**
-     * Render form descriptions
+     * Render form notifications
      *
      * @param   string      $content    The html rendered so far
      *
@@ -31,16 +32,27 @@ class FormNotifications extends Zend_Form_Decorator_Abstract
         }
 
         $notifications = $this->recurseForm($form);
-
         if (empty($notifications)) {
             return $content;
         }
 
         $html = '<ul class="form-notifications">';
+        foreach (array(Form::NOTIFICATION_ERROR, Form::NOTIFICATION_WARNING, Form::NOTIFICATION_INFO) as $type) {
+            if (isset($notifications[$type])) {
+                $html .= '<li><ul class="' . $this->getNotificationTypeName($type) . '">';
+                foreach ($notifications[$type] as $message) {
+                    if (is_array($message)) {
+                        list($message, $properties) = $message;
+                        $html .= '<li' . $view->propertiesToString($properties) . '>'
+                            . $view->escape($message)
+                            . '</li>';
+                    } else {
+                        $html .= '<li>' . $view->escape($message) . '</li>';
+                    }
+                }
 
-        asort($notifications);
-        foreach ($notifications as $message => $type) {
-            $html .= '<li class="'.self::getNotificationTypeName($type).'">' . $view->escape($message) . '</li>';
+                $html .= '</ul></li>';
+            }
         }
 
         switch ($this->getPlacement()) {
@@ -54,42 +66,44 @@ class FormNotifications extends Zend_Form_Decorator_Abstract
     /**
      * Recurse the given form and return the notifications for it and all of its subforms
      *
-     * @param   Form    $form       The form to recurse
+     * @param   Form    $form   The form to recurse
      *
-     * @return array
+     * @return  array
      */
     protected function recurseForm(Form $form)
     {
         $notifications = $form->getNotifications();
-
         foreach ($form->getSubForms() as $subForm) {
-            $notifications = $notifications + $this->recurseForm($subForm);
+            foreach ($this->recurseForm($subForm) as $type => $messages) {
+                foreach ($messages as $message) {
+                    $notifications[$type][] = $message;
+                }
+            }
         }
 
         return $notifications;
     }
 
     /**
-     * Get the readable type name of the notification
+     * Return the name for the given notification type
      *
-     * @param   $type       Type of the message
+     * @param   int     $type
      *
      * @return  string
+     *
+     * @throws  ProgrammingError    In case the given type is invalid
      */
-    public static function getNotificationTypeName($type)
+    protected function getNotificationTypeName($type)
     {
         switch ($type) {
             case Form::NOTIFICATION_ERROR:
                 return 'error';
-                break;
             case Form::NOTIFICATION_WARNING:
                 return 'warning';
-                break;
             case Form::NOTIFICATION_INFO:
                 return 'info';
-                break;
             default:
-                return 'unknown';
+                throw new ProgrammingError('Invalid notification type "%s" provided', $type);
         }
     }
 }
diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php
index 496809c33..b91129d10 100644
--- a/modules/monitoring/library/Monitoring/MonitoringWizard.php
+++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php
@@ -25,7 +25,7 @@ use Icinga\Module\Setup\Requirement\PhpModuleRequirement;
 class MonitoringWizard extends Wizard implements SetupWizard
 {
     /**
-     * @see Wizard::init()
+     * Register all pages for this wizard
      */
     public function init()
     {
@@ -39,7 +39,10 @@ class MonitoringWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see Wizard::setupPage()
+     * Setup the given page that is either going to be displayed or validated
+     *
+     * @param   Form        $page       The page to setup
+     * @param   Request     $request    The current request
      */
     public function setupPage(Form $page, Request $request)
     {
@@ -52,18 +55,30 @@ class MonitoringWizard extends Wizard implements SetupWizard
             $this->getDirection() === static::FORWARD
             && ($page->getName() === 'setup_monitoring_ido' || $page->getName() === 'setup_monitoring_livestatus')
         ) {
-            if ((($dbResourceData = $this->getPageData('setup_db_resource')) !== null
-                 && $dbResourceData['name'] === $request->getPost('name'))
-                || (($ldapResourceData = $this->getPageData('setup_ldap_resource')) !== null
-                    && $ldapResourceData['name'] === $request->getPost('name'))
+            if (
+                (($authDbResourceData = $this->getPageData('setup_auth_db_resource')) !== null
+                 && $authDbResourceData['name'] === $request->getPost('name'))
+                || (($configDbResourceData = $this->getPageData('setup_config_db_resource')) !== null
+                    && $configDbResourceData['name'] === $request->getPost('name'))
+                    || (($ldapResourceData = $this->getPageData('setup_ldap_resource')) !== null
+                        && $ldapResourceData['name'] === $request->getPost('name'))
             ) {
-                $page->addError(mt('monitoring', 'The given resource name is already in use.'));
+                $page->error(mt('monitoring', 'The given resource name is already in use.'));
             }
         }
     }
 
     /**
-     * @see Wizard::getNewPage()
+     * Return the new page to set as current page
+     *
+     * {@inheritdoc} Runs additional checks related to some registered pages.
+     *
+     * @param   string  $requestedPage      The name of the requested page
+     * @param   Form    $originPage         The origin page
+     *
+     * @return  Form                        The new page
+     *
+     * @throws  InvalidArgumentException    In case the requested page does not exist or is not permitted yet
      */
     protected function getNewPage($requestedPage, Form $originPage)
     {
@@ -81,7 +96,9 @@ class MonitoringWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see Wizard::addButtons()
+     * Add buttons to the given page based on its position in the page-chain
+     *
+     * @param   Form    $page   The page to add the buttons to
      */
     protected function addButtons(Form $page)
     {
@@ -100,7 +117,9 @@ class MonitoringWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see SetupWizard::getSetup()
+     * Return the setup for this wizard
+     *
+     * @return  Setup
      */
     public function getSetup()
     {
@@ -132,7 +151,9 @@ class MonitoringWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see SetupWizard::getRequirements()
+     * Return the requirements of this wizard
+     *
+     * @return  RequirementSet
      */
     public function getRequirements()
     {
diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index 5118ce291..2d3e9d712 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -202,7 +202,7 @@ class AdminAccountPage extends Form
             return false;
         }
 
-        if ($data['user_type'] === 'new_user' && !$this->hasUser($data['new_user'])) {
+        if ($data['user_type'] === 'new_user' && $this->hasUser($data['new_user'])) {
             $this->getElement('new_user')->addError($this->translate('Username already exists.'));
             return false;
         }
@@ -255,7 +255,11 @@ class AdminAccountPage extends Form
      */
     protected function hasUser($username)
     {
-        return $this->createBackend()->select()->where('user_name', $username)->count() > 1;
+        try {
+            return $this->createBackend()->select()->where('user_name', $username)->count() > 1;
+        } catch (Exception $_) {
+            return null;
+        }
     }
 
     /**
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index 7564b577f..2caab9122 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -121,7 +121,7 @@ class AuthBackendPage extends Form
             return false;
         }
 
-        if (false === isset($data['skip_validation']) || $data['skip_validation'] == 0) {
+        if ($this->config['type'] === 'ldap' && ( !isset($data['skip_validation']) || $data['skip_validation'] == 0)) {
             $self = clone $this;
             $self->addElement(
                 'text',
@@ -130,7 +130,7 @@ class AuthBackendPage extends Form
                     'value' => $this->getResourceConfig()
                 )
             );
-            if ($this->config['type'] === 'ldap' && false === LdapBackendForm::isValidUserBackend($self)) {
+            if (! LdapBackendForm::isValidUserBackend($self)) {
                 $this->addSkipValidationCheckbox();
                 return false;
             }
diff --git a/modules/setup/application/forms/DatabaseCreationPage.php b/modules/setup/application/forms/DatabaseCreationPage.php
index f92fce1c3..b3ecca3b9 100644
--- a/modules/setup/application/forms/DatabaseCreationPage.php
+++ b/modules/setup/application/forms/DatabaseCreationPage.php
@@ -38,7 +38,6 @@ class DatabaseCreationPage extends Form
      */
     public function init()
     {
-        $this->setName('setup_database_creation');
         $this->setTitle($this->translate('Database Setup', 'setup.page.title'));
         $this->addDescription($this->translate(
             'It seems that either the database you defined earlier does not yet exist and cannot be created'
@@ -156,7 +155,7 @@ class DatabaseCreationPage extends Form
                 $db->connectToHost(); // Are we able to login on the server?
             } catch (PDOException $e) {
                 // We are NOT able to login on the server..
-                $this->addError($e->getMessage());
+                $this->error($e->getMessage());
                 $this->addSkipValidationCheckbox();
                 return false;
             }
@@ -165,7 +164,7 @@ class DatabaseCreationPage extends Form
         // In case we are connected the credentials filled into this
         // form need to be granted to create databases, users...
         if (false === $db->checkPrivileges($this->databaseSetupPrivileges)) {
-            $this->addError(
+            $this->error(
                 $this->translate('The provided credentials cannot be used to create the database and/or the user.')
             );
             $this->addSkipValidationCheckbox();
@@ -174,7 +173,7 @@ class DatabaseCreationPage extends Form
 
         // ...and to grant all required usage privileges to others
         if (false === $db->isGrantable($this->databaseUsagePrivileges)) {
-            $this->addError(sprintf(
+            $this->error(sprintf(
                 $this->translate(
                     'The provided credentials cannot be used to grant all required privileges to the login "%s".'
                 ),
diff --git a/modules/setup/application/forms/DbResourcePage.php b/modules/setup/application/forms/DbResourcePage.php
index 8844ced4c..e9967f350 100644
--- a/modules/setup/application/forms/DbResourcePage.php
+++ b/modules/setup/application/forms/DbResourcePage.php
@@ -18,7 +18,6 @@ class DbResourcePage extends Form
      */
     public function init()
     {
-        $this->setName('setup_db_resource');
         $this->setTitle($this->translate('Database Resource', 'setup.page.title'));
         $this->addDescription($this->translate(
             'Now please configure your database resource. Note that the database itself does not need to'
@@ -56,14 +55,6 @@ class DbResourcePage extends Form
         $resourceForm = new DbResourceForm();
         $this->addElements($resourceForm->createElements($formData)->getElements());
         $this->getElement('name')->setValue('icingaweb_db');
-        $this->addElement(
-            'hidden',
-            'prefix',
-            array(
-                'required'  => true,
-                'value'     => 'icingaweb_'
-            )
-        );
     }
 
     /**
@@ -84,7 +75,7 @@ class DbResourcePage extends Form
                 $db = new DbTool($this->getValues());
                 $db->checkConnectivity();
             } catch (PDOException $e) {
-                $this->addError($e->getMessage());
+                $this->error($e->getMessage());
                 $this->addSkipValidationCheckbox();
                 return false;
             }
diff --git a/modules/setup/application/forms/GeneralConfigPage.php b/modules/setup/application/forms/GeneralConfigPage.php
index c50d77293..922b1428f 100644
--- a/modules/setup/application/forms/GeneralConfigPage.php
+++ b/modules/setup/application/forms/GeneralConfigPage.php
@@ -3,8 +3,9 @@
 
 namespace Icinga\Module\Setup\Forms;
 
-use Icinga\Web\Form;
+use Icinga\Forms\Config\General\ApplicationConfigForm;
 use Icinga\Forms\Config\General\LoggingConfigForm;
+use Icinga\Web\Form;
 
 /**
  * Wizard page to define the application and logging configuration
@@ -28,7 +29,13 @@ class GeneralConfigPage extends Form
      */
     public function createElements(array $formData)
     {
-        $loggingForm = new LoggingConfigForm();
-        $this->addElements($loggingForm->createElements($formData)->getElements());
+        $appConfigForm = new ApplicationConfigForm();
+        $appConfigForm->createElements($formData);
+        $appConfigForm->removeElement('global_module_path');
+        $appConfigForm->removeElement('global_config_resource');
+        $this->addElements($appConfigForm->getElements());
+
+        $loggingConfigForm = new LoggingConfigForm();
+        $this->addElements($loggingConfigForm->createElements($formData)->getElements());
     }
 }
diff --git a/modules/setup/application/forms/LdapDiscoveryPage.php b/modules/setup/application/forms/LdapDiscoveryPage.php
index 588791e2c..4a825d7f1 100644
--- a/modules/setup/application/forms/LdapDiscoveryPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryPage.php
@@ -77,7 +77,7 @@ class LdapDiscoveryPage extends Form
             } catch (Exception $e) {
             }
 
-            $this->addError(
+            $this->error(
                 sprintf($this->translate('Could not find any LDAP servers on the domain "%s".'), $data['domain'])
             );
         } else {
diff --git a/modules/setup/application/forms/PreferencesPage.php b/modules/setup/application/forms/PreferencesPage.php
deleted file mode 100644
index fdd5844cf..000000000
--- a/modules/setup/application/forms/PreferencesPage.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
-
-namespace Icinga\Module\Setup\Forms;
-
-use Icinga\Web\Form;
-use Icinga\Application\Platform;
-
-/**
- * Wizard page to choose a preference backend
- */
-class PreferencesPage extends Form
-{
-    /**
-     * Initialize this page
-     */
-    public function init()
-    {
-        $this->setRequiredCue(null);
-        $this->setName('setup_preferences_type');
-        $this->setTitle($this->translate('Preferences', 'setup.page.title'));
-        $this->addDescription($this->translate('Please choose how Icinga Web 2 should store user preferences.'));
-    }
-
-    /**
-     * @see Form::createElements()
-     */
-    public function createElements(array $formData)
-    {
-        $storageTypes = array();
-        $storageTypes['ini'] = $this->translate('File System (INI Files)');
-        if (Platform::hasMysqlSupport() || Platform::hasPostgresqlSupport()) {
-            $storageTypes['db'] = $this->translate('Database');
-        }
-        $storageTypes['none'] = $this->translate('Don\'t Store Preferences');
-
-        $this->addElement(
-            'select',
-            'store',
-            array(
-                'required'      => true,
-                'label'         => $this->translate('User Preference Storage Type'),
-                'multiOptions'  => $storageTypes
-            )
-        );
-    }
-}
diff --git a/modules/setup/library/Setup/Steps/GeneralConfigStep.php b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
index 84ac446c1..86462bbb0 100644
--- a/modules/setup/library/Setup/Steps/GeneralConfigStep.php
+++ b/modules/setup/library/Setup/Steps/GeneralConfigStep.php
@@ -23,13 +23,12 @@ class GeneralConfigStep extends Step
     {
         $config = array();
         foreach ($this->data['generalConfig'] as $sectionAndPropertyName => $value) {
-            list($section, $property) = explode('_', $sectionAndPropertyName);
+            list($section, $property) = explode('_', $sectionAndPropertyName, 2);
             $config[$section][$property] = $value;
         }
 
-        $config['preferences']['store'] = $this->data['preferencesStore'];
-        if (isset($this->data['preferencesResource'])) {
-            $config['preferences']['resource'] = $this->data['preferencesResource'];
+        if ($config['global']['config_backend'] === 'db') {
+            $config['global']['config_resource'] = $this->data['resourceName'];
         }
 
         try {
@@ -54,14 +53,10 @@ class GeneralConfigStep extends Step
         $generalHtml = ''
             . '<ul>'
             . '<li>' . sprintf(
-                $this->data['preferencesStore'] === 'ini' ? sprintf(
+                $this->data['generalConfig']['global_config_backend'] === 'ini' ? sprintf(
                     t('Preferences will be stored per user account in INI files at: %s'),
                     Config::resolvePath('preferences')
-                ) : (
-                    $this->data['preferencesStore'] === 'db' ? t('Preferences will be stored using a database.') : (
-                        t('Preferences will not be persisted across browser sessions.')
-                    )
-                )
+                ) : t('Preferences will be stored using a database.')
             ) . '</li>'
             . '</ul>';
 
diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php
index 96d39e63f..f3cda15a4 100644
--- a/modules/setup/library/Setup/WebWizard.php
+++ b/modules/setup/library/Setup/WebWizard.php
@@ -13,7 +13,6 @@ use Icinga\Module\Setup\Forms\ModulePage;
 use Icinga\Module\Setup\Forms\WelcomePage;
 use Icinga\Module\Setup\Forms\SummaryPage;
 use Icinga\Module\Setup\Forms\DbResourcePage;
-use Icinga\Module\Setup\Forms\PreferencesPage;
 use Icinga\Module\Setup\Forms\AuthBackendPage;
 use Icinga\Module\Setup\Forms\AdminAccountPage;
 use Icinga\Module\Setup\Forms\LdapDiscoveryPage;
@@ -91,7 +90,7 @@ class WebWizard extends Wizard implements SetupWizard
     );
 
     /**
-     * @see Wizard::init()
+     * Register all pages and module wizards for this wizard
      */
     protected function init()
     {
@@ -99,15 +98,16 @@ class WebWizard extends Wizard implements SetupWizard
         $this->addPage(new ModulePage());
         $this->addPage(new RequirementsPage());
         $this->addPage(new AuthenticationPage());
-        $this->addPage(new PreferencesPage());
-        $this->addPage(new DbResourcePage());
+        $this->addPage(new DbResourcePage(array('name' => 'setup_auth_db_resource')));
+        $this->addPage(new DatabaseCreationPage(array('name' => 'setup_auth_db_creation')));
         $this->addPage(new LdapDiscoveryPage());
         //$this->addPage(new LdapDiscoveryConfirmPage());
         $this->addPage(new LdapResourcePage());
         $this->addPage(new AuthBackendPage());
         $this->addPage(new AdminAccountPage());
         $this->addPage(new GeneralConfigPage());
-        $this->addPage(new DatabaseCreationPage());
+        $this->addPage(new DbResourcePage(array('name' => 'setup_config_db_resource')));
+        $this->addPage(new DatabaseCreationPage(array('name' => 'setup_config_db_creation')));
         $this->addPage(new SummaryPage(array('name' => 'setup_summary')));
 
         if (($modulePageData = $this->getPageData('setup_modules')) !== null) {
@@ -119,25 +119,19 @@ class WebWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see Wizard::setupPage()
+     * Setup the given page that is either going to be displayed or validated
+     *
+     * @param   Form        $page       The page to setup
+     * @param   Request     $request    The current request
      */
     public function setupPage(Form $page, Request $request)
     {
         if ($page->getName() === 'setup_requirements') {
             $page->setWizard($this);
-        } elseif ($page->getName() === 'setup_preferences_type') {
-            $authData = $this->getPageData('setup_authentication_type');
-            if ($authData['type'] === 'db') {
-                $page->create()->getElement('store')->setValue('db');
-                $page->addDescription(mt(
-                    'setup',
-                    'Note that choosing "Database" causes Icinga Web 2 to use the same database as for authentication.'
-                ));
-            }
         } elseif ($page->getName() === 'setup_authentication_backend') {
             $authData = $this->getPageData('setup_authentication_type');
             if ($authData['type'] === 'db') {
-                $page->setResourceConfig($this->getPageData('setup_db_resource'));
+                $page->setResourceConfig($this->getPageData('setup_auth_db_resource'));
             } elseif ($authData['type'] === 'ldap') {
                 $page->setResourceConfig($this->getPageData('setup_ldap_resource'));
 
@@ -152,38 +146,46 @@ class WebWizard extends Wizard implements SetupWizard
             $page->setBackendConfig($this->getPageData('setup_authentication_backend'));
             $authData = $this->getPageData('setup_authentication_type');
             if ($authData['type'] === 'db') {
-                $page->setResourceConfig($this->getPageData('setup_db_resource'));
+                $page->setResourceConfig($this->getPageData('setup_auth_db_resource'));
             } elseif ($authData['type'] === 'ldap') {
                 $page->setResourceConfig($this->getPageData('setup_ldap_resource'));
             }
-        } elseif ($page->getName() === 'setup_database_creation') {
+        } elseif ($page->getName() === 'setup_auth_db_creation' || $page->getName() === 'setup_config_db_creation') {
             $page->setDatabaseSetupPrivileges(
                 array_unique(array_merge($this->databaseCreationPrivileges, $this->databaseSetupPrivileges))
             );
             $page->setDatabaseUsagePrivileges($this->databaseUsagePrivileges);
-            $page->setResourceConfig($this->getPageData('setup_db_resource'));
+            $page->setResourceConfig(
+                $this->getPageData('setup_auth_db_resource') ?: $this->getPageData('setup_config_db_resource')
+            );
         } elseif ($page->getName() === 'setup_summary') {
             $page->setSubjectTitle('Icinga Web 2');
             $page->setSummary($this->getSetup()->getSummary());
-        } elseif ($page->getName() === 'setup_db_resource') {
+        } elseif ($page->getName() === 'setup_config_db_resource') {
             $ldapData = $this->getPageData('setup_ldap_resource');
             if ($ldapData !== null && $request->getPost('name') === $ldapData['name']) {
-                $page->addError(
+                $page->error(
                     mt('setup', 'The given resource name must be unique and is already in use by the LDAP resource')
                 );
             }
         } elseif ($page->getName() === 'setup_ldap_resource') {
-            $dbData = $this->getPageData('setup_db_resource');
-            if ($dbData !== null && $request->getPost('name') === $dbData['name']) {
-                $page->addError(
-                    mt('setup', 'The given resource name must be unique and is already in use by the database resource')
-                );
-            }
-
             $suggestion = $this->getPageData('setup_ldap_discovery');
             if (isset($suggestion['resource'])) {
                 $page->populate($suggestion['resource']);
             }
+        } elseif ($page->getName() === 'setup_general_config') {
+            $authData = $this->getPageData('setup_authentication_type');
+            if ($authData['type'] === 'db') {
+                $page->create()->getElement('global_config_backend')->setValue('db');
+                $page->info(
+                    mt(
+                        'setup',
+                        'Note that choosing "Database" as preference storage causes'
+                        . ' Icinga Web 2 to use the same database as for authentication.'
+                    ),
+                    false
+                );
+            }
         } elseif ($page->getName() === 'setup_authentication_type' && $this->getDirection() === static::FORWARD) {
             $authData = $this->getPageData($page->getName());
             if ($authData !== null && $request->getPost('type') !== $authData['type']) {
@@ -192,21 +194,37 @@ class WebWizard extends Wizard implements SetupWizard
                 $pageData = & $this->getPageData();
                 unset($pageData['setup_admin_account']);
                 unset($pageData['setup_authentication_backend']);
+
+                if ($authData['type'] === 'db') {
+                    unset($pageData['setup_auth_db_resource']);
+                    unset($pageData['setup_auth_db_creation']);
+                } elseif ($request->getPost('type') === 'db') {
+                    unset($pageData['setup_config_db_resource']);
+                    unset($pageData['setup_config_db_creation']);
+                }
             }
         }
     }
 
     /**
-     * @see Wizard::getNewPage()
+     * Return the new page to set as current page
+     *
+     * {@inheritdoc} Runs additional checks related to some registered pages.
+     *
+     * @param   string  $requestedPage      The name of the requested page
+     * @param   Form    $originPage         The origin page
+     *
+     * @return  Form                        The new page
+     *
+     * @throws  InvalidArgumentException    In case the requested page does not exist or is not permitted yet
      */
     protected function getNewPage($requestedPage, Form $originPage)
     {
         $skip = false;
         $newPage = parent::getNewPage($requestedPage, $originPage);
-        if ($newPage->getName() === 'setup_db_resource') {
-            $prefData = $this->getPageData('setup_preferences_type');
+        if ($newPage->getName() === 'setup_auth_db_resource') {
             $authData = $this->getPageData('setup_authentication_type');
-            $skip = $prefData['store'] !== 'db' && $authData['type'] !== 'db';
+            $skip = $authData['type'] !== 'db';
         } elseif ($newPage->getname() === 'setup_ldap_discovery') {
             $authData = $this->getPageData('setup_authentication_type');
             $skip = $authData['type'] !== 'ldap';
@@ -215,8 +233,17 @@ class WebWizard extends Wizard implements SetupWizard
         } elseif ($newPage->getName() === 'setup_ldap_resource') {
             $authData = $this->getPageData('setup_authentication_type');
             $skip = $authData['type'] !== 'ldap';
-        } elseif ($newPage->getName() === 'setup_database_creation') {
-            if (($config = $this->getPageData('setup_db_resource')) !== null && ! $config['skip_validation']) {
+        } elseif ($newPage->getName() === 'setup_config_db_resource') {
+            $authData = $this->getPageData('setup_authentication_type');
+            $configData = $this->getPageData('setup_general_config');
+            $skip = $authData['type'] === 'db' || $configData['global_config_backend'] !== 'db';
+        } elseif (in_array($newPage->getName(), array('setup_auth_db_creation', 'setup_config_db_creation'))) {
+            if (
+                ($newPage->getName() === 'setup_auth_db_creation' || $this->hasPageData('setup_config_db_resource'))
+                && (($config = $this->getPageData('setup_auth_db_resource')) !== null
+                    || ($config = $this->getPageData('setup_config_db_resource')) !== null)
+                    && !$config['skip_validation']
+            ) {
                 $db = new DbTool($config);
 
                 try {
@@ -254,7 +281,9 @@ class WebWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see Wizard::addButtons()
+     * Add buttons to the given page based on its position in the page-chain
+     *
+     * @param   Form    $page   The page to add the buttons to
      */
     protected function addButtons(Form $page)
     {
@@ -270,7 +299,7 @@ class WebWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see Wizard::clearSession()
+     * Clear the session being used by this wizard and drop the setup token
      */
     public function clearSession()
     {
@@ -283,29 +312,54 @@ class WebWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see SetupWizard::getSetup()
+     * Return the setup for this wizard
+     *
+     * @return  Setup
      */
     public function getSetup()
     {
         $pageData = $this->getPageData();
         $setup = new Setup();
 
-        if (isset($pageData['setup_db_resource'])
-            && ! $pageData['setup_db_resource']['skip_validation']
-            && (false === isset($pageData['setup_database_creation'])
-                || ! $pageData['setup_database_creation']['skip_validation']
+        if (
+            isset($pageData['setup_auth_db_resource'])
+            && !$pageData['setup_auth_db_resource']['skip_validation']
+            && (! isset($pageData['setup_auth_db_creation'])
+                || !$pageData['setup_auth_db_creation']['skip_validation']
             )
         ) {
             $setup->addStep(
                 new DatabaseStep(array(
                     'tables'            => $this->databaseTables,
                     'privileges'        => $this->databaseUsagePrivileges,
-                    'resourceConfig'    => $pageData['setup_db_resource'],
-                    'adminName'         => isset($pageData['setup_database_creation']['username'])
-                        ? $pageData['setup_database_creation']['username']
+                    'resourceConfig'    => $pageData['setup_auth_db_resource'],
+                    'adminName'         => isset($pageData['setup_auth_db_creation']['username'])
+                        ? $pageData['setup_auth_db_creation']['username']
                         : null,
-                    'adminPassword'     => isset($pageData['setup_database_creation']['password'])
-                        ? $pageData['setup_database_creation']['password']
+                    'adminPassword'     => isset($pageData['setup_auth_db_creation']['password'])
+                        ? $pageData['setup_auth_db_creation']['password']
+                        : null,
+                    'schemaPath'        => Config::module('setup')
+                        ->get('schema', 'path', Icinga::app()->getBaseDir('etc' . DIRECTORY_SEPARATOR . 'schema'))
+                ))
+            );
+        } elseif (
+            isset($pageData['setup_config_db_resource'])
+            && !$pageData['setup_config_db_resource']['skip_validation']
+            && (! isset($pageData['setup_config_db_creation'])
+                || !$pageData['setup_config_db_creation']['skip_validation']
+            )
+        ) {
+            $setup->addStep(
+                new DatabaseStep(array(
+                    'tables'            => $this->databaseTables,
+                    'privileges'        => $this->databaseUsagePrivileges,
+                    'resourceConfig'    => $pageData['setup_config_db_resource'],
+                    'adminName'         => isset($pageData['setup_config_db_creation']['username'])
+                        ? $pageData['setup_config_db_creation']['username']
+                        : null,
+                    'adminPassword'     => isset($pageData['setup_config_db_creation']['password'])
+                        ? $pageData['setup_config_db_creation']['password']
                         : null,
                     'schemaPath'        => Config::module('setup')
                         ->get('schema', 'path', Icinga::app()->getBaseDir('etc' . DIRECTORY_SEPARATOR . 'schema'))
@@ -315,22 +369,24 @@ class WebWizard extends Wizard implements SetupWizard
 
         $setup->addStep(
             new GeneralConfigStep(array(
-                'generalConfig'         => $pageData['setup_general_config'],
-                'preferencesStore'       => $pageData['setup_preferences_type']['store'],
-                'preferencesResource'   => isset($pageData['setup_db_resource']['name'])
-                    ? $pageData['setup_db_resource']['name']
-                    : null
+                'generalConfig' => $pageData['setup_general_config'],
+                'resourceName'  => isset($pageData['setup_auth_db_resource']['name'])
+                    ? $pageData['setup_auth_db_resource']['name']
+                    : (isset($pageData['setup_config_db_resource']['name'])
+                        ? $pageData['setup_config_db_resource']['name']
+                        : null
+                    )
             ))
         );
 
         $adminAccountType = $pageData['setup_admin_account']['user_type'];
         $adminAccountData = array('username' => $pageData['setup_admin_account'][$adminAccountType]);
-        if ($adminAccountType === 'new_user' && ! $pageData['setup_db_resource']['skip_validation']
-            && (false === isset($pageData['setup_database_creation'])
-                || ! $pageData['setup_database_creation']['skip_validation']
+        if ($adminAccountType === 'new_user' && !$pageData['setup_auth_db_resource']['skip_validation']
+            && (! isset($pageData['setup_auth_db_creation'])
+                || !$pageData['setup_auth_db_creation']['skip_validation']
             )
         ) {
-            $adminAccountData['resourceConfig'] = $pageData['setup_db_resource'];
+            $adminAccountData['resourceConfig'] = $pageData['setup_auth_db_resource'];
             $adminAccountData['password'] = $pageData['setup_admin_account']['new_user_password'];
         }
         $authType = $pageData['setup_authentication_type']['type'];
@@ -338,18 +394,25 @@ class WebWizard extends Wizard implements SetupWizard
             new AuthenticationStep(array(
                 'adminAccountData'  => $adminAccountData,
                 'backendConfig'     => $pageData['setup_authentication_backend'],
-                'resourceName'      => $authType === 'db' ? $pageData['setup_db_resource']['name'] : (
+                'resourceName'      => $authType === 'db' ? $pageData['setup_auth_db_resource']['name'] : (
                     $authType === 'ldap' ? $pageData['setup_ldap_resource']['name'] : null
                 )
             ))
         );
 
-        if (isset($pageData['setup_db_resource']) || isset($pageData['setup_ldap_resource'])) {
+        if (
+            isset($pageData['setup_auth_db_resource'])
+            || isset($pageData['setup_config_db_resource'])
+            || isset($pageData['setup_ldap_resource'])
+        ) {
             $setup->addStep(
                 new ResourceStep(array(
-                    'dbResourceConfig'      => isset($pageData['setup_db_resource'])
-                        ? array_diff_key($pageData['setup_db_resource'], array('skip_validation' => null))
-                        : null,
+                    'dbResourceConfig'      => isset($pageData['setup_auth_db_resource'])
+                        ? array_diff_key($pageData['setup_auth_db_resource'], array('skip_validation' => null))
+                        : (isset($pageData['setup_config_db_resource'])
+                            ? array_diff_key($pageData['setup_config_db_resource'], array('skip_validation' => null))
+                            : null
+                        ),
                     'ldapResourceConfig'    => isset($pageData['setup_ldap_resource'])
                         ? array_diff_key($pageData['setup_ldap_resource'], array('skip_validation' => null))
                         : null
@@ -369,7 +432,9 @@ class WebWizard extends Wizard implements SetupWizard
     }
 
     /**
-     * @see SetupWizard::getRequirements()
+     * Return the requirements of this wizard
+     *
+     * @return  RequirementSet
      */
     public function getRequirements($skipModules = false)
     {
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index 91ae82682..42f04d7f3 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -139,7 +139,6 @@ form div.element ul.errors {
   li {
     color: @colorCritical;
     font-weight: bold;
-    line-height: 1.5em;
   }
 }
 
@@ -160,33 +159,33 @@ form ul.form-errors {
   li {
     color: white;
     font-weight: bold;
-    line-height: 1.5em;
   }
 }
 
 form ul.form-notifications {
   .non-list-like-list;
   margin-bottom: 1em;
-  padding: 0em;
+  padding: 0;
 
-  li.info {
-    background: @colorFormNotificationInfo;
-  }
+  ul {
+    .non-list-like-list;
 
-  li.warning {
-    background: @colorFormNotificationWarning;
-  }
+    &.info {
+      background-color: @colorFormNotificationInfo;
+    }
 
-  li.error {
-    background: @colorFormNotificationError;
+    &.warning {
+      background-color: @colorFormNotificationWarning;
+    }
+
+    &.error {
+      background-color: @colorFormNotificationError;
+    }
   }
 
   li {
     color: white;
     font-weight: bold;
-    line-height: 1.5em;
-    padding: 0.5em;
-    margin-bottom: 0.5em;
   }
 }