diff --git a/interface/web/mail/form/mail_user.tform.php b/interface/web/mail/form/mail_user.tform.php
index 773afa7e5641df38db7282dc168018634352db33..5ed0146139094d25f1ebe6cd37ad5e1dc9ed6a0e 100644
--- a/interface/web/mail/form/mail_user.tform.php
+++ b/interface/web/mail/form/mail_user.tform.php
@@ -94,7 +94,7 @@ $form["tabs"]['mailuser'] = array (
 			'validators'	=> array ( 	0 => array (	'type'	=> 'ISINT',
 														'errmsg'=> 'quota_error_isint'),
 										1 => array (	'type'	=> 'REGEX',
-														'regex' => '/^(-1)|([1-9][0-9]*)$/',
+														'regex' => '/^([0-9]*)$/',
 														'errmsg'=> 'quota_error_value'),
 									),
 			'default'	=> '-1',
diff --git a/interface/web/mail/lib/lang/en_mail_user.lng b/interface/web/mail/lib/lang/en_mail_user.lng
index bfca13a43e311d2fcc7f138cf48adcd057821e19..5566be9d8cd33f9ecb05676cd9415bb7db5c1520 100644
--- a/interface/web/mail/lib/lang/en_mail_user.lng
+++ b/interface/web/mail/lib/lang/en_mail_user.lng
@@ -28,5 +28,5 @@ $wb["welcome_mail_message"] = "Welcome to your new email account. Your webmaster
 $wb["disableimap_txt"] = 'Disable IMAP';
 $wb["disablepop3_txt"] = 'Disable POP3';
 $wb["duplicate_alias_or_forward_txt"] = 'There is already an alias or forwrd with this email address.';
-$wb["quota_error_value"] = 'Invalid quota value. Allowed values are: -1 for unlimited or numbers > 1';
+$wb["quota_error_value"] = 'Invalid quota value. Allowed values are: 0 for unlimited or numbers > 1';
 ?>