diff --git a/CHANGELOG b/CHANGELOG
index f4774c57d..3e1c3ec32 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix "Initialize Database" button missing from installer (#1485802)
 - Fix compose window doesn't fit 1024x768 window (#1485396)
 - Fix service not available error when pressing back from compose dialog (#1485552)
 - Fix using mail() on Windows (#1485779)
diff --git a/installer/test.php b/installer/test.php
index d66fe34f2..5740a6489 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -159,7 +159,7 @@ if ($db_working && $_POST['initdb']) {
 // test database
 if ($db_working) {
     $db_read = $DB->query("SELECT count(*) FROM {$RCI->config['db_table_users']}");
-    if (!$db_read) {
+    if ($DB->db_error) {
         $RCI->fail('DB Schema', "Database not initialized");
         echo '<p><input type="submit" name="initdb" value="Initialize database" /></p>';
         $db_working = false;