diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml
index 29c37a43f..3bc16930c 100644
--- a/Resources/translations/messages.fr.yml
+++ b/Resources/translations/messages.fr.yml
@@ -63,19 +63,27 @@ This group does not provide any permission: Ce groupe n'attribue aucune permissi
 
 #admin section for users
 List users: Liste des utilisateurs
-user list: liste des utilisateurs
+user list: Liste des utilisateurs
 User edit: Modification d'un utilisateur
+User creation: Créer un utilisateur
 User'status: Statut de l'utilisateur
 Disabled, the user is not allowed to login: Désactivé, l'utilisateur n'est pas autorisé à se connecter
 Enabled, the user is active: Actif, l'utilisateur peut se connecter
 Edit password: Modifier le mot de passe
+Repeat the password: Répéter le mot de passe
 Permissions granted: Permissions accordées
+Any permissions granted to this user: Aucune permission n'est accordée à cet utilisateur
 Grant new permissions: Ajout de permissions
 Add a new groupCenter: Ajout de permissions
+The permissions have been successfully added to the user: Les permissions ont été accordées à l'utilisateur
+The permissions where removed.: Les permissions ont été enlevées.
 Center & groups: Centre et groupes
 User %username%: Utilisateur %username%
 Add a new user: Ajouter un nouvel utilisateur
 The permissions have been added: Les permissions ont été ajoutées
+Edit password for %username%: Éditer le mot de passe de %username%
+Change password: Changer le mot de passe
+Back to the user edition: Retour au formulaire d'édition
 
 #admin section for circles (old: scopes)
 List circles: Liste des cercles
diff --git a/Resources/translations/validators.fr.yml b/Resources/translations/validators.fr.yml
index fe2796f60..1293504ba 100644
--- a/Resources/translations/validators.fr.yml
+++ b/Resources/translations/validators.fr.yml
@@ -1,4 +1,6 @@
 # role_scope constraint
 # scope presence
 The role "%role%" require to be associated with a scope.: Le rôle "%role%" doit être associé à un cercle.
-The role "%role%" should not be associated with a scope.: Le rôle "%role%" ne doit pas être associé à un cercle.
\ No newline at end of file
+The role "%role%" should not be associated with a scope.: Le rôle "%role%" ne doit pas être associé à un cercle.
+"The password must contains one letter, one capitalized letter, one number and one special character as *[@#$%!,;:+\"'-/{}~=µ()£]). Other characters are allowed.": "Le mot de passe doit contenir une majuscule, une minuscule, et au moins un caractère spécial parmi *[@#$%!,;:+\"'-/{}~=µ()£]). Les autres caractères sont autorisés."
+The password fields must match: Les mots de passe doivent correspondre
\ No newline at end of file
diff --git a/Resources/views/User/edit.html.twig b/Resources/views/User/edit.html.twig
index 21ec92f96..c52caec2d 100644
--- a/Resources/views/User/edit.html.twig
+++ b/Resources/views/User/edit.html.twig
@@ -50,10 +50,10 @@
             </tbody>
         </table>
     {% else %}
-        <p>{{ 'no permissions granted to this user'|trans }}</p>
+        <p>{{ 'Any permissions granted to this user'|trans }}.</p>
     {% endif %}
     
-    <h2>{{ 'Grant new permissions'|trans }}</h2>
+    <h3>{{ 'Grant new permissions'|trans }}</h3>
     
     {{ form_start(add_groupcenter_form) }}
     {{ form_row(add_groupcenter_form.composed_groupcenter.center) }}
@@ -63,10 +63,15 @@
     {{ form_end(add_groupcenter_form) }}
     
         <ul class="record_actions">
-    <li>
-        <a href="{{ path('admin_user') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-</ul>
+            <li>
+                <a href="{{ path('admin_user_show', { 'id': entity.id }) }}">
+                    {{ 'show'|trans }}
+                </a>
+            </li>
+            <li>
+                <a href="{{ path('admin_user') }}">
+                    {{ 'Back to the list'|trans }}
+                </a>
+            </li>
+        </ul>
 {% endblock %}
diff --git a/Resources/views/User/edit_password.html.twig b/Resources/views/User/edit_password.html.twig
index 3a54d5126..70a98620c 100644
--- a/Resources/views/User/edit_password.html.twig
+++ b/Resources/views/User/edit_password.html.twig
@@ -5,7 +5,10 @@
 {% block admin_content -%}
     <h1>{{ 'Edit password for %username%'|trans( { '%username%': entity.username } ) }}</h1>
 
-    {{ form(edit_form) }}
+    {{ form_start(edit_form) }}
+    {{ form_row(edit_form.password) }}
+    {{ form_widget(edit_form.submit, { 'attr': { 'class': 'sc-button orange' } } ) }}
+    {{ form_end(edit_form) }}
     
         <ul class="record_actions">
     <li>
diff --git a/Resources/views/User/index.html.twig b/Resources/views/User/index.html.twig
index 948725f70..b999f5342 100644
--- a/Resources/views/User/index.html.twig
+++ b/Resources/views/User/index.html.twig
@@ -24,6 +24,9 @@
                     <li>
                         <a href="{{ path('admin_user_edit', { 'id': entity.id }) }}">{{ 'edit'|trans }}</a>
                     </li>
+                    <li>
+                        <a href="{{ path('admin_user_edit_password',  { 'id' : entity.id }) }}">{{ 'Edit password'|trans }}</a>
+                    </li>
                 </ul>
                 </td>
             </tr>
diff --git a/Resources/views/User/new.html.twig b/Resources/views/User/new.html.twig
index 9396d072b..87398d973 100644
--- a/Resources/views/User/new.html.twig
+++ b/Resources/views/User/new.html.twig
@@ -5,7 +5,11 @@
 {% block admin_content -%}
     <h1>{{ 'User creation'|trans }}</h1>
 
-    {{ form(form) }}
+    {{ form_start(form) }}
+    {{ form_row(form.username) }}
+    {{ form_row(form.plainPassword.password) }}
+    {{ form_widget(form.submit, { 'attr' : { 'class': 'sc-button blue' } }) }}
+    {{ form_end(form) }}
 
         <ul class="record_actions">
     <li>
diff --git a/Resources/views/User/show.html.twig b/Resources/views/User/show.html.twig
index 8fa1401b0..9de1d8340 100644
--- a/Resources/views/User/show.html.twig
+++ b/Resources/views/User/show.html.twig
@@ -54,9 +54,9 @@
     </table>
     
     {% else %}
-        <p>{{ 'The user does not belong to any groupcenter'|trans }}.
+        <p>{{ 'Any permissions granted to this user'|trans }}.
             <a href="{{ path('admin_user_edit', { 'id': entity.id }) }}">
-                {{ 'Add new group centers'|trans }}
+                {{ 'Grant new permissions'|trans }}
             </a>
         </p>
     {% endif %}