diff --git a/edit-domain.php b/edit-domain.php
index 1186b00c..e1177fe8 100644
--- a/edit-domain.php
+++ b/edit-domain.php
@@ -80,9 +80,6 @@ if ($_SERVER['REQUEST_METHOD'] == "POST")
 
     if ($fBackupmx == "on")
     {
-        $fAliases = -1;
-        $fMailboxes = -1;
-        $fMaxquota = -1;
         $fBackupmx = 1;
         $sqlBackupmx = db_get_boolean(True);
     }
diff --git a/list-virtual.php b/list-virtual.php
index 75565703..ee4124be 100644
--- a/list-virtual.php
+++ b/list-virtual.php
@@ -193,20 +193,17 @@ if (isset ($limit)) {
       $tDisplay_next = $fDisplay + $page_size;
    }
 
-   $backup_mx = $limit['backupmx'];
-   if($backup_mx == 'f' || $backup_mx == 0) {
-      if($limit['aliases'] == 0) {
-         $tCanAddAlias = true;
-      }
-      elseif($limit['alias_count'] < $limit['aliases']) {
-         $tCanAddAlias = true;
-      }
-      if($limit['mailboxes'] == 0) {
-         $tCanAddMailbox = true;
-      }
-      elseif($limit['mailbox_count'] < $limit['mailboxes']) {
-         $tCanAddMailbox = true;
-      }
+   if($limit['aliases'] == 0) {
+      $tCanAddAlias = true;
+   }
+   elseif($limit['alias_count'] < $limit['aliases']) {
+      $tCanAddAlias = true;
+   }
+   if($limit['mailboxes'] == 0) {
+      $tCanAddMailbox = true;
+   }
+   elseif($limit['mailbox_count'] < $limit['mailboxes']) {
+      $tCanAddMailbox = true;
    }
 }