diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index 011267b115e2c408272d8b288c0137f5dd45f281..644b04cfb3f995a7441f1bbdfe83a699cacb9dac 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -157,10 +157,14 @@ class page_action extends tform_actions {
 			$app->uses('quota_lib');
 			$clientid = $app->db->queryOneRecord('SELECT `client_id` FROM `sys_group` WHERE `groupid` = ?', $this->dataRecord['sys_groupid']);
 			$monitor_data = $app->quota_lib->get_mailquota_data($clientid, FALSE, $this->dataRecord['email']);
-			if ($this->dataRecord['quota'] != 0) {
-				$app->tpl->setVar("used_percentage", round($monitor_data['used'] * 100 / $this->dataRecord['quota']));
-			}
-			$app->tpl->setVar('used', $app->functions->formatBytes($monitor_data['used'], 0));
+            if(!empty($monitor_data) && is_array($monitor_data)) {
+                if ($this->dataRecord['quota'] != 0 && isset($monitor_data['used'])) {
+                    $app->tpl->setVar("used_percentage", round($monitor_data['used'] * 100 / $this->dataRecord['quota']));
+                }
+                if(isset($monitor_data['used'])) {
+                    $app->tpl->setVar('used', $app->functions->formatBytes($monitor_data['used'], 0));
+                }
+            }
 
 			# Get addresses for this account.
 			$addresses = $app->db->queryAllRecords("SELECT source, type FROM mail_forwarding WHERE destination = ? AND ".$app->tform->getAuthSQL('r'), $email);
@@ -345,7 +349,6 @@ class page_action extends tform_actions {
 		$disablesmtp = ($this->dataRecord["disablesmtp"])?'y':'n';
 		$disabledeliver = ($this->dataRecord["disabledeliver"])?'y':'n';
 
-		$app->db->query($sql, $disableimap, $disableimap, $disablepop3, $disablesmtp, $disabledeliver, $disabledeliver, $this->id);
 		$sql = "UPDATE mail_user SET disableimap = ?, disablesieve = ?, disablepop3 = ?, disablesmtp = ?, disabledeliver = ?, disablelda = ?, disablelmtp = ? WHERE mailuser_id = ?";
 		$app->db->query($sql, $disableimap, $disableimap, $disablepop3, $disablesmtp, $disabledeliver, $disabledeliver, $disabledeliver, $this->id);
 	}
diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index 2d8d14536ce7cbc5562d27b0a1479c5e2fa98bce..f29b2410509383f8067bfdafe130ace73be9c636 100644
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -135,8 +135,6 @@
 
             </div>
 
-
-
         <input type="hidden" name="id" value="{tmpl_var name='id'}">
         <input type="hidden" name="type" value="local">
         <div class="clear">