diff --git a/src/locales/en.json b/src/locales/en.json
index 2e507bcc..db7ecf7a 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -238,6 +238,6 @@
     "user_emailforward" : "Mail forward",
     "user_new_mail": "newmail@mydomain.org",
     "user_new_forward": "newforward@myforeigndomain.org",
-    "user_quota": "Quota",
-    "quota_description": "Mailbox size quota must be a size with b/k/M/G/T suffix or 0 to disable the quota"
+    "user_mailbox_quota": "Mailbox quota",
+    "mailbox_quota_description": "Mailbox quota must be a size with b/k/M/G/T suffix or 0 to disable the quota."
 }
diff --git a/src/views/user/user_create.ms b/src/views/user/user_create.ms
index 04f15424..07c5be1d 100644
--- a/src/views/user/user_create.ms
+++ b/src/views/user/user_create.ms
@@ -44,10 +44,10 @@
         </div>
         <hr>
         <div class="form-group">
-            <label for="quota" class="col-sm-3 control-label">{{t 'user_quota'}}</label>
+            <label for="mailbox-quota" class="col-sm-3 control-label">{{t 'user_mailbox_quota'}}</label>
             <div class="col-sm-9">
-                <input type="ext" id="quota" name="quota" class="form-control" placeholder="10G" required>
-                <div class="help-block">{{t 'quota_description'}}</div>
+                <input type="text" id="mailbox-quota" name="mailbox_quota" class="form-control" placeholder="500M" required>
+                <div class="help-block">{{t 'mailbox_quota_description'}}</div>
             </div>
         </div>
         <div class="form-group">
diff --git a/src/views/user/user_edit.ms b/src/views/user/user_edit.ms
index 64425e20..1fe43da9 100644
--- a/src/views/user/user_edit.ms
+++ b/src/views/user/user_edit.ms
@@ -44,9 +44,10 @@
             </div>
         </div>
         <div class="form-group">
-            <label for="username" class="col-sm-3 control-label">{{t 'user_quota'}}</label>
+            <label for="mailbox-quota" class="col-sm-3 control-label">{{t 'user_mailbox_quota'}}</label>
             <div class="col-sm-9">
-                <input type="text" id="mailbox-quota" name="mailbox-quota" class="form-control" placeholder="{{mailbox-quota}}" value="{{mailbox-quota}}">
+                <input type="text" id="mailbox-quota" name="mailbox_quota" class="form-control" placeholder="{{mailbox-quota}}">
+                <div class="help-block">{{t 'mailbox_quota_description'}}</div>
             </div>
         </div>
 
diff --git a/src/views/user/user_info.ms b/src/views/user/user_info.ms
index 34dfba67..9ea1155b 100644
--- a/src/views/user/user_info.ms
+++ b/src/views/user/user_info.ms
@@ -34,7 +34,7 @@
           </tr>
 
           <tr>
-            <td><strong>{{t 'user_quota'}}</strong></td>
+            <td><strong>{{t 'user_mailbox_quota'}}</strong></td>
 
             <td>{{mailbox-quota}}</td>
           </tr
diff --git a/src/views/user/user_list.ms b/src/views/user/user_list.ms
index 262486e8..2def847e 100644
--- a/src/views/user/user_list.ms
+++ b/src/views/user/user_list.ms
@@ -17,7 +17,6 @@
         <span class="pull-right fa-chevron-right"></span>
         <h2 class="list-group-item-heading">{{@key}} <small>{{fullname}}</small></h2>
         <p class="list-group-item-text">{{mail}}</p>
-        <p class="list-group-item-text">{{mailbox-quota}}</p>
     </a>
 {{else}}
 <div class="alert alert-warning">