diff --git a/admin/forms.py b/admin/forms.py
index 4028ddf2f..38a907c2e 100644
--- a/admin/forms.py
+++ b/admin/forms.py
@@ -13,7 +13,8 @@ class DomainForm(forms.ModelForm):
             self.fields[f].widget.attrs['size'] = 14
 
 class MailboxForm(forms.ModelForm):
-    quota = forms.IntegerField(label=_("Quota"), required=False)
+    quota = forms.IntegerField(label=_("Quota"), required=False,
+                               help_text=_("Mailbox quota in MB (default to domain quota if blank)"))
     password1 = forms.CharField(label=_("Password"), widget=forms.PasswordInput,
                                 help_text=_("Password used to log in"))
     password2 = forms.CharField(label=_("Confirmation"), widget=forms.PasswordInput,
diff --git a/admin/models.py b/admin/models.py
index 6c4c6fe04..732ec50a8 100644
--- a/admin/models.py
+++ b/admin/models.py
@@ -41,7 +41,7 @@ class Mailbox(models.Model):
                                help_text=_("Mailbox address (without the @domain.tld part)"))
     full_address = models.CharField(max_length=150)
     password = models.CharField(_('password'), max_length=100)
-    quota = models.IntegerField(help_text=_("Mailbox quota in MB (default to domain quota if blank)"))
+    quota = models.IntegerField()
     uid = models.IntegerField()
     gid = models.IntegerField()
     path = models.CharField(max_length=200)