diff --git a/src/js/yunohost/controllers/users.js b/src/js/yunohost/controllers/users.js
index 80ee3054..03c9425d 100644
--- a/src/js/yunohost/controllers/users.js
+++ b/src/js/yunohost/controllers/users.js
@@ -197,25 +197,20 @@
 
     // Create user (POST)
     app.post('#/users/create', function (c) {
-        if (c.params['password'] == c.params['confirmation']) {
-            if (c.params['password'].length < PASSWORD_MIN_LENGTH) {
-                c.flash('fail', y18n.t('passwords_too_short'));
-            }
-            else {
-                // Force unit or disable quota
-                if (c.params['mailbox_quota']) {
-                    c.params['mailbox_quota'] += "M";
-                }
-                else {c.params['mailbox_quota'] = 0;}
-                c.params['domain'] = c.params['domain'].slice(1);
-
-                c.api('POST', '/users', c.params.toHash(), function(data) {
-                    c.redirect_to('#/users');
-                });
-            }
-        } else {
+        if (c.params['password'] != c.params['confirmation']) {
             c.flash('fail', y18n.t('passwords_dont_match'));
+            return;
         }
+        if (c.params['password'].length < PASSWORD_MIN_LENGTH) {
+            c.flash('fail', y18n.t('passwords_too_short'));
+            return;
+        }
+
+        c.params['domain'] = c.params['domain'].slice(1);
+
+        c.api('POST', '/users', c.params.toHash(), function(data) {
+            c.redirect_to('#/users');
+        });
     });
 
     // Show user information
diff --git a/src/views/user/user_create.ms b/src/views/user/user_create.ms
index ff7d34c3..5fc6c7cb 100644
--- a/src/views/user/user_create.ms
+++ b/src/views/user/user_create.ms
@@ -57,16 +57,6 @@
                </select>
             </div>
         </div>
-        <div class="form-group">
-            <label for="mailbox-quota" class="col-sm-3 control-label">{{t 'user_mailbox_quota'}}</label>
-            <div class="col-sm-4">
-                <div class="input-group">
-                    <input type="number" min="0" id="mailbox-quota" name="mailbox_quota" class="form-control" placeholder="{{t 'mailbox_quota_placeholder'}}">
-                    <div class="input-group-addon">M</div>
-                </div>
-                <div class="help-block quota-help-block">{{t 'mailbox_quota_description'}}</div>
-            </div>
-        </div>
 
     </div>
 </div>