diff --git a/js/app.js b/js/app.js
index cd398c68..ab3fd805 100644
--- a/js/app.js
+++ b/js/app.js
@@ -393,10 +393,16 @@ app = Sammy('#main', function (sam) {
 
     sam.post('#/users', function (c) {
         if (c.params['password'] == c.params['confirmation']) {
-            c.params['mail'] = c.params['email'] + c.params['domain'];
-            c.api('/users', function(data) { // http://api.yunohost.org/#!/user/user_create_post_2
-                c.redirect('#/users');
-            }, 'POST', c.params.toHash());
+            if (c.params['password'].length < 4) {
+                c.flash('fail', "Passwords is too short");
+                store.clear('slide');
+            }
+            else {
+                c.params['mail'] = c.params['email'] + c.params['domain'];
+                c.api('/users', function(data) { // http://api.yunohost.org/#!/user/user_create_post_2
+                    c.redirect('#/users');
+                }, 'POST', c.params.toHash());
+            }
         } else {
             c.flash('fail', "Passwords don't match");
             store.clear('slide');
diff --git a/views/user_create.ms b/views/user_create.ms
index a0173367..ebdcf573 100644
--- a/views/user_create.ms
+++ b/views/user_create.ms
@@ -52,6 +52,7 @@
             <label for="confirmation" class="col-sm-3 control-label">Confirmation</label>
             <div class="col-sm-9">
                 <input type="password" name="confirmation" class="form-control" placeholder="•••••" required>
+                <div class="help-block">Password must be at least 4 characters long.</div>
             </div>
         </div>
     </div>