diff --git a/locale/de.json b/locale/de.json
index 9034792..19d1364 100644
--- a/locale/de.json
+++ b/locale/de.json
@@ -241,7 +241,8 @@
         "Use a password to restrict access": "Verwende ein Passwort um den Zugriff zu beschänken",
         "The results are publicly visible": "Die Ergebnisse sind öffentlich Einsehbar",
         "Poll password": "Password",
-        "Confirm password": "Passwort bestätigen",
+        "Password choice": "DE_Choix",
+        "Password confirmation": "DE_Confirmation",
         "Go to step 2": "Weiter zum 2. Schritt"
     },
     "Step 2": {
diff --git a/locale/en.json b/locale/en.json
index 44c8e7f..611a301 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -241,7 +241,8 @@
     "Use a password to restrict access": "Use a password to restrict access",
     "The results are publicly visible": "The results are publicly visible",
     "Poll password": "Password",
-    "Confirm password": "Confirmer votre mot de passe",
+    "Password choice": "Choice",
+    "Password confirmation": "Confirmation",
     "Go to step 2": "Go to step 2"
   },
   "Step 2": {
diff --git a/locale/es.json b/locale/es.json
index 7d1a56e..73e032c 100644
--- a/locale/es.json
+++ b/locale/es.json
@@ -241,7 +241,8 @@
     "Use a password to restrict access": "ES_Utiliser un mot de passe pour restreindre l'accès au sondage",
     "The results are publicly visible": "ES_Les résultats sont visibles sans mot de passe",
     "Poll password": "ES_Mot de passe",
-    "Confirm password": "ES_Confirmer votre mot de passe",
+    "Password choice": "ES_Choix",
+    "Password confirmation": "ES_Confirmation",
     "Go to step 2": "Ir al paso número 2"
   },
   "Step 2": {
diff --git a/locale/fr.json b/locale/fr.json
index 241267b..6828471 100644
--- a/locale/fr.json
+++ b/locale/fr.json
@@ -235,13 +235,14 @@
     "Votes cannot be modified": "Aucun vote ne peut être modifié",
     "All voters can modify any vote": "Tous les sondés peuvent modifier tous les votes",
     "Voters can modify their vote themselves": "Chaque sondé peut modifier son propre vote",
-    "To receive an email for each new vote": "Recevoir un courriel à chaque participation d'un sondé",
+    "To receive an email for each new vote": "Recevoir un courriel à chaque participation",
     "To receive an email for each new comment": "Recevoir un courriel à chaque commentaire",
     "Only the poll maker can see the poll's results": "Seul le créateur du sondage peut voir les résultats",
-    "Use a password to restrict access": "Utiliser un mot de passe pour restreindre l'accès au sondage",
+    "Use a password to restrict access": "Restreindre l'accès au sondage par mot de passe",
     "The results are publicly visible": "Les résultats sont visibles sans mot de passe",
     "Poll password": "Mot de passe",
-    "Confirm password": "Confirmer votre mot de passe   ",
+    "Password choice": "Choix",
+    "Password confirmation": "Confirmation",
     "Go to step 2": "Aller à l'étape 2"
   },
   "Step 2": {
@@ -419,4 +420,4 @@
     "Check again": "Vérifier à nouveau",
     "Continue the installation": "Continuer l'installation"
   }
-}
\ No newline at end of file
+}
diff --git a/locale/it.json b/locale/it.json
index 5a0cabb..6c61d57 100644
--- a/locale/it.json
+++ b/locale/it.json
@@ -241,7 +241,8 @@
     "Use a password to restrict access": "Utilizzare una passwor per limitare l'accesso al sondaggio",
     "The results are publicly visible": "I risultati sono visibili senza password",
     "Poll password": "Password",
-    "Confirm password": "Conferma della password",
+    "Password choice": "IT_Choix",
+    "Password confirmation": "Conferma della password",
     "Go to step 2": "Andare al punto 2"
   },
   "Step 2": {
diff --git a/locale/oc.json b/locale/oc.json
index b8f5688..45aad66 100644
--- a/locale/oc.json
+++ b/locale/oc.json
@@ -241,7 +241,8 @@
     "Use a password to restrict access": "OC_Utiliser un mot de passe pour restreindre l'accès au sondage",
     "The results are publicly visible": "OC_Les résultats sont visibles sans mot de passe",
     "Poll password": "OC_Mot de passe",
-    "Confirm password": "OC_Confirmer votre mot de passe   ",
+    "Password choice": "OC_Choix",
+    "Password confirmation": "OC_Confirmation",
     "Go to step 2": "Anar a l'etapa 2"
   },
   "Step 2": {
diff --git a/tpl/create_poll.tpl b/tpl/create_poll.tpl
index fd3dbde..3d8e434 100644
--- a/tpl/create_poll.tpl
+++ b/tpl/create_poll.tpl
@@ -124,7 +124,11 @@
                 {/if}
 
                 <div class="form-group">
-                    <div class="col-sm-offset-4 col-sm-8">
+                    <label for="poll_id" class="col-sm-4 control-label">
+                        {__('Step 1', 'Poll password')}
+                    </label>
+
+                    <div class="col-sm-8">
                         <div class="checkbox">
                             <label>
                                 <input type="checkbox" name="use_password" {if $poll_use_password}checked{/if}
@@ -133,10 +137,13 @@
                             </label>
                         </div>
                     </div>
+
                     <div id="password_options"{if !$poll_use_password} class="hidden"{/if}>
-                        <label for="poll_password" class="col-sm-4 control-label">{__('Step 1', 'Poll password')}</label>
-                        <div class="col-sm-8">
-                            <input id="poll_password" type="password" name="password" class="form-control" {$errors['password']['aria']}/>
+                        <div class="col-sm-offset-4 col-sm-8">
+                            <div class="input-group">
+                                <input id="poll_password" type="password" name="password" class="form-control" {$errors['password']['aria']}/>
+                                <label for="poll_password" class="input-group-addon">{__('Step 1', 'Password choice')}</label>
+                            </div>
                         </div>
                         {if !empty($errors['password']['msg'])}
                             <div class="alert alert-danger">
@@ -145,9 +152,11 @@
                                 </p>
                             </div>
                         {/if}
-                        <label for="poll_password_repeat" class="col-sm-4 control-label">{__('Step 1', 'Confirm password')}</label>
-                        <div class="col-sm-8">
-                            <input id="poll_password_repeat" type="password" name="password_repeat" class="form-control" {$errors['password_repeat']['aria']}/>
+                        <div class="col-sm-offset-4 col-sm-8">
+                            <div class="input-group">
+                                <input id="poll_password_repeat" type="password" name="password_repeat" class="form-control" {$errors['password_repeat']['aria']}/>
+                                <label for="poll_password_repeat" class="input-group-addon">{__('Step 1', 'Password confirmation')}</label>
+                            </div>
                         </div>
                         {if !empty($errors['password_repeat']['msg'])}
                             <div class="alert alert-danger">