diff --git a/web/add/mail/index.php b/web/add/mail/index.php
index 8769c4638..b260b465d 100644
--- a/web/add/mail/index.php
+++ b/web/add/mail/index.php
@@ -112,7 +112,6 @@ if (!empty($_POST['ok_acc'])) {
     $v_fwd = $_POST['v_fwd'];
     if (empty($_POST['v_quota'])) $v_quota = 0;
     if ((!empty($_POST['v_quota'])) || (!empty($_POST['v_aliases'])) || (!empty($_POST['v_fwd'])) ) $v_adv = 'yes';
-    $v_quota = escapeshellarg($_POST['v_quota']);
 
     // Add Mail Account
     if (empty($_SESSION['error_msg'])) {
diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html
index 110a7ed98..f0e6e1acd 100644
--- a/web/templates/admin/add_mail_acc.html
+++ b/web/templates/admin/add_mail_acc.html
@@ -196,15 +196,15 @@
                             <td><?=__('SMTP auth method')?>:</td>
                             <td><div><?=__('Normal password')?></div></td>
                         </tr>
-            <?
-              list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
-              $webmail = "http://".$http_host."/webmail/";
-              if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
-              ?>
+                        <?
+                            list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
+                            $webmail = "http://".$http_host."/webmail/";
+                            if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
+                        ?>
                         <tr>
                             <td><?=__('Webmail URL')?>:</td>
                             <td><div><a class="vst" href="<?=$webmail?>" target="_blank"><?=$webmail?> <i></i></a></div></td>
-            </tr>
+                        </tr>
                     </table>
                 </div>
             </td>