diff --git a/js/app.js b/js/app.js
index 882ca50e..2a435ae1 100644
--- a/js/app.js
+++ b/js/app.js
@@ -354,7 +354,10 @@ app = Sammy('#main', function (sam) {
     });
 
     sam.post('#/postinstall', function (c) {
-        if (c.params['password'] == c.params['confirmation']) {
+        if (c.params['password'] == '' || c.params['confirmation'] == '') {
+            c.flash('fail', y18n.t('password_empty'))
+        }
+        else if (c.params['password'] == c.params['confirmation']) {
             if (c.params['domain'] == '') {
                 if (c.params['ddomain'] == '') {
                     c.flash('fail', y18n.t('error_select_domain'));
diff --git a/locales/en.json b/locales/en.json
index 2c67b0eb..435e4df5 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -42,6 +42,7 @@
     "wrong_password" : "Wrong password",
     "passwords_dont_match" : "Passwords don't match",
     "passwords_too_short" : "Password is too short",
+    "password_empty" : "Password field is empty",
     "logged_in" : "Logged in",
     "logged_out" : "Logged out",
     "error_occured" : "An error occured, try again",
diff --git a/locales/fr.json b/locales/fr.json
index 1cc57d82..32487165 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -42,11 +42,12 @@
     "wrong_password" : "Mot de passe incorrect",
     "passwords_dont_match" : "Les mots de passe ne correspondent pas",
     "passwords_too_short" : "Mot de passe trop court",
+    "password_empty" : "Le champ mot de passe est vide",
     "logged_in" : "Connecté",
     "logged_out" : "Déconnecté",
     "error_occured" : "Une erreur est survenue, veuillez réessayer.",
     "error_server" : "Erreur serveur",
-    "error_select_domain" : "Vous devez indiquer une domaine.",
+    "error_select_domain" : "Vous devez indiquer un domaine.",
     "error_modify_something" : "Vous devez modifier quelque chose.",
     "non_compatible_api" : "API Non compatible",
     "warning_first_user" : "Vous devez probablement d'abord <a href='#/users/create' class='alert-link'>créer un utilisateur</a>.",