diff --git a/data/web/edit.php b/data/web/edit.php
index 10b85660..64218c07 100644
--- a/data/web/edit.php
+++ b/data/web/edit.php
@@ -592,8 +592,13 @@ if (isset($_SESSION['mailcow_cc_role'])) {
               <br><span id="quotaBadge" class="badge">max. <?=intval($result['max_new_quota'] / 1048576)?> MiB</span>
             </label>
             <div class="col-sm-10">
-              <input type="number" name="quota" style="width:100%" min="0" max="<?=intval($result['max_new_quota'] / 1048576);?>" value="<?=intval($result['quota']) / 1048576;?>" class="form-control">
+              <?php
+              $quotaMin = ((!isset($_SESSION['acl']['unlimited_quota']) || $_SESSION['acl']['unlimited_quota'] != "1") && intval($result['quota']) > 0) ? 1 : 0;
+              ?>
+              <input type="number" name="quota" style="width:100%" min="<?=$quotaMin?>" max="<?=intval($result['max_new_quota'] / 1048576);?>" value="<?=intval($result['quota']) / 1048576;?>" class="form-control">
+              <?php if($quotaMin === 0): ?>
               <small class="help-block">0 = ∞</small>
+              <?php endif; ?>
             </div>
           </div>
           <div class="form-group">
diff --git a/data/web/modals/mailbox.php b/data/web/modals/mailbox.php
index c1362c4f..140ba20d 100644
--- a/data/web/modals/mailbox.php
+++ b/data/web/modals/mailbox.php
@@ -42,9 +42,13 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
             <label class="control-label col-sm-2" for="addInputQuota"><?=$lang['add']['quota_mb'];?>
               <br /><span id="quotaBadge" class="badge">max. - MiB</span>
             </label>
-            <div class="col-sm-10">
-            <input type="text" class="form-control" name="quota" min="0" max="" id="addInputQuota" disabled value="<?=$lang['add']['select_domain'];?>" required>
+            <?php
+              $quotaMin = (!isset($_SESSION['acl']['unlimited_quota']) || $_SESSION['acl']['unlimited_quota'] != "1") > 0) ? 1 : 0;
+            ?>
+            <input type="text" class="form-control" name="quota" min="<?=$quotaMin?>" max="" id="addInputQuota" disabled value="<?=$lang['add']['select_domain'];?>" required>
+            <?php if($quotaMin === 0): ?>
             <small class="help-block">0 = ∞</small>
+            <?php endif; ?>
             <div class="label label-warning addInputQuotaExhausted" style="display:none;"><?=$lang['warning']['quota_exceeded_scope'];?></div>
             </div>
           </div>