diff --git a/library/Icinga/Application/WebInstaller.php b/library/Icinga/Application/WebInstaller.php
index 54323f966..1e225f94e 100644
--- a/library/Icinga/Application/WebInstaller.php
+++ b/library/Icinga/Application/WebInstaller.php
@@ -272,8 +272,7 @@ class WebInstaller implements Installer
             ));
         }
 
-        $diff = array_diff(array('account', 'preference'), $db->listTables());
-        if (empty($diff)) {
+        if (array_search('account', $db->listTables()) !== false) {
             $this->log(t('Database schema already exists...'));
         } else {
             $this->log(t('Creating database schema...'));
@@ -337,8 +336,7 @@ class WebInstaller implements Installer
             ));
         }
 
-        $diff = array_diff(array('account', 'preference'), $db->listTables());
-        if (empty($diff)) {
+        if (array_search('account', $db->listTables()) !== false) {
             $this->log(t('Database schema already exists...'));
         } else {
             $this->log(t('Creating database schema...'));
diff --git a/library/Icinga/Application/WebSetup.php b/library/Icinga/Application/WebSetup.php
index 9f0fa04b6..84f732789 100644
--- a/library/Icinga/Application/WebSetup.php
+++ b/library/Icinga/Application/WebSetup.php
@@ -29,13 +29,6 @@ use Icinga\Application\Platform;
  */
 class WebSetup extends Wizard implements SetupWizard
 {
-    /**
-     * The database tables required by Icinga Web 2
-     *
-     * @var array
-     */
-    protected $databaseTables = array('account', 'preference');
-
     /**
      * The privileges required by Icinga Web 2 to setup the database
      *
@@ -148,8 +141,7 @@ class WebSetup extends Wizard implements SetupWizard
 
                 try {
                     $db->connectToDb();
-                    $diff = array_diff($this->databaseTables, $db->listTables());
-                    if (false === empty($diff)) {
+                    if (array_search('account', $db->listTables()) === false) {
                         $skip = $db->checkPrivileges($this->databaseSetupPrivileges);
                     } else {
                         $skip = true;