diff --git a/data/web/inc/functions.mailbox.inc.php b/data/web/inc/functions.mailbox.inc.php
index d3d78146..1e8c2f90 100644
--- a/data/web/inc/functions.mailbox.inc.php
+++ b/data/web/inc/functions.mailbox.inc.php
@@ -3383,7 +3383,7 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) {
               $_SESSION['return'][] = array(
                 'type' => 'danger',
                 'log' => array(__FUNCTION__, $_action, $_type, $_data_log, $_attr),
-                'msg' => 'domain_not_empty'
+                'msg' => array('domain_not_empty', $domain)
               );
               continue;
             }
diff --git a/data/web/inc/init_db.inc.php b/data/web/inc/init_db.inc.php
index ea6fe15d..ddbf5ab1 100644
--- a/data/web/inc/init_db.inc.php
+++ b/data/web/inc/init_db.inc.php
@@ -8,7 +8,7 @@ function init_db_schema() {
     $stmt = $pdo->query("SHOW TABLES LIKE 'versions'");
     $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
     if ($num_results != 0) {
-      $stmt = $pdo->query("SELECT `version` FROM `versions`");
+      $stmt = $pdo->query("SELECT `version` FROM `versions` WHERE `application` = 'db_schema'");
       if ($stmt->fetch(PDO::FETCH_ASSOC)['version'] == $db_version) {
         return true;
       }
diff --git a/data/web/lang/lang.de.php b/data/web/lang/lang.de.php
index 8bfa2b71..b68e41d8 100644
--- a/data/web/lang/lang.de.php
+++ b/data/web/lang/lang.de.php
@@ -152,7 +152,7 @@ $lang['danger']['domain_quota_m_in_use'] = 'Domain Speicherplatzlimit muss grö
 $lang['danger']['mailboxes_in_use'] = 'Maximale Anzahl an Mailboxen muss größer oder gleich %d sein';
 $lang['danger']['aliases_in_use'] = 'Maximale Anzahl an Aliassen muss größer oder gleich %d sein';
 $lang['danger']['sender_acl_invalid'] = 'Sender ACL %s ist ungültig';
-$lang['danger']['domain_not_empty'] = 'Kann nur leere Domains entfernen';
+$lang['danger']['domain_not_empty'] = 'Domain %s ist nicht leer';
 $lang['danger']['validity_missing'] = 'Bitte geben Sie eine Gültigkeitsdauer an';
 $lang['user']['loading'] = "Lade...";
 $lang['user']['force_pw_update'] = 'Das Passwort für diesen Benutzer <b>muss</b> geändert werden, damit die Zugriffssperre auf die Groupwarekomponenten wieder freigeschaltet wird.';
diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php
index 67123afd..a2be5060 100644
--- a/data/web/lang/lang.en.php
+++ b/data/web/lang/lang.en.php
@@ -156,7 +156,7 @@ $lang['danger']['domain_quota_m_in_use'] = "Domain quota must be greater or equa
 $lang['danger']['mailboxes_in_use'] = "Max. mailboxes must be greater or equal to %d";
 $lang['danger']['aliases_in_use'] = "Max. aliases must be greater or equal to %d";
 $lang['danger']['sender_acl_invalid'] = "Sender ACL value %s is invalid";
-$lang['danger']['domain_not_empty'] = "Cannot remove non-empty domain";
+$lang['danger']['domain_not_empty'] = "Cannot remove non-empty domain %s";
 $lang['danger']['validity_missing'] = 'Please assign a period of validity';
 $lang['user']['loading'] = "Loading...";
 $lang['user']['force_pw_update'] = 'You <b>must</b> set a new password to be able to access groupware related services.';