diff --git a/templates/web/user/account.html.twig b/templates/web/user/account.html.twig
index e29e77dcde..5823db6c6b 100644
--- a/templates/web/user/account.html.twig
+++ b/templates/web/user/account.html.twig
@@ -252,7 +252,7 @@
                 </table>
             </div>
             <div class="tab-pane">
-                <div id="id-main" class="tab-content" style="display: block; text-align: center; overflow-y: auto; overflow-x: hidden;">
+                <div id="id-main" class="tab-content" style="display: block; overflow-y: auto; overflow-x: hidden;">
                     <div id="tab-account-cat">
                         <ul>
                             <li><a href="#tab-account-info">{% trans 'Informations' %}</a></li>
@@ -269,25 +269,29 @@
                                         {% if notice != '' %}
                                             <div class="notice">{{ notice }}</div>
                                         {% endif %}
-                                        <form name="account" id="account" action="/login/account.php" method="post">
-                                            <table style="margin: 20px auto;">
-                                                <tr>
-                                                    <td></td>
-                                                    <td><a href="/login/reset-password.php" class="link" target="_self">{% trans 'admin::compte-utilisateur changer mon mot de passe' %}</a></td>
-                                                    <td></td>
-                                                </tr>
-                                                <tr>
-                                                    <td colspan="3"></td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="form_label"><label for="form_login">{% trans 'admin::compte-utilisateur identifiant' %}</label></td>
-                                                    <td class="form_input">{{ user.get_login() }}</td>
-                                                    <td class="form_alert"></td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="form_label"><label for="form_gender">{% trans 'admin::compte-utilisateur sexe' %}</label></td>
-                                                    <td class="form_input">
-                                                        <select class="input_element" name="form_gender" id="form_gender"  >
+                                        <form name="account" id="account" class="form-horizontal" action="/login/account.php" method="post">
+                                            <fieldset>
+
+                                                <legend>{% trans 'Informations personnelles' %}</legend>
+
+                                                <div class="control-group">
+                                                    <div class="controls">
+                                                        <p><a href="/login/reset-password.php" class="link" target="_self">{% trans 'admin::compte-utilisateur changer mon mot de passe' %}</a></p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="control-group">
+                                                    <label class="form_label control-label" for="form_login">{% trans 'admin::compte-utilisateur identifiant' %}</label>
+                                                    <div class="controls">
+                                                        <p>{{ user.get_login() }}</p>
+                                                        <p class="form_alert help-block"></p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="control-group">
+                                                    <label class="form_label control-label" for="form_gender">{% trans 'admin::compte-utilisateur sexe' %}</label>
+                                                    <div class="controls">
+                                                        <select>
                                                             <option {% if user.get_gender() == "0" %}selected{% endif %} value="0" >
                                                                 {% trans 'admin::compte-utilisateur:sexe: mademoiselle' %}
                                                             </option>
@@ -298,121 +302,121 @@
                                                                 {% trans 'admin::compte-utilisateur:sexe: monsieur' %}
                                                             </option>
                                                         </select>
-                                                    </td>
-                                                    <td class="form_alert"></td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="form_label"><label for="form_lastname">{% trans 'admin::compte-utilisateur nom' %}</label></td>
-                                                    <td class="form_input">
-                                                        <input class="input_element" type="text" name="form_lastname" id="form_lastname" value="{{ user.get_lastname() }}" >
-                                                    </td>
-                                                    <td class="form_alert"></td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="form_label"><label for="form_firstname">{% trans 'admin::compte-utilisateur prenom' %}</label></td>
-                                                    <td class="form_input">
-                                                        <input  class="input_element"  type="text" name="form_firstname" id="form_firstname" value="{{ user.get_firstname() }}" >
-                                                    </td>
-                                                    <td class="form_alert"></td>
-                                                </tr>
-                                                <tr>
-                                                    <td colspan="3">
-                                                </tr>
-                                                <tr>
-                                                    <td class="form_label"><label for="">{% trans 'admin::compte-utilisateur email' %}</label></td>
-                                                    <td class="form_input" colspan="2">
-                                                        {{ user.get_email() }} <a class="link" href="/login/reset-email.php" target="_self">{% trans 'login:: Changer mon adresse email' %}</a>
-                                                    </td>
-                                                </tr>
-                                                <tr>
-                                                    <td colspan="3"></td>
-                                                </tr>
-                                                <tr>
-                                                    <td colspan="3">{% trans 'Notification par email' %}</td>
-                                                </tr>
+                                                        <p class="form_alert help-block"></p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="control-group">
+                                                    <label class="form_label control-label" for="form_lastname">{% trans 'admin::compte-utilisateur nom' %}</label>
+                                                    <div class="controls">
+                                                        <input class="input_element" type="text" name="form_lastname" id="form_lastname" value="{{ user.get_lastname() }}" />
+                                                        <p class="form_alert help-block"></p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="control-group">
+                                                    <label class="form_label control-label" for="form_firstname">{% trans 'admin::compte-utilisateur prenom' %}</label>
+                                                    <div class="controls">
+                                                        <input class="input_element" type="text" name="form_firstname" id="form_firstname" value="{{ user.get_firstname() }}" />
+                                                        <p class="form_alert help-block"></p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="control-group">
+                                                    <label class="form_label control-label" for="form_address">{% trans 'admin::compte-utilisateur adresse' %}</label>
+                                                    <div class="controls">
+                                                        <input class="input_element" type="text" name="form_address" id="form_address" value="{{ user.get_address() }}" />
+                                                        <p class="form_alert help-block"></p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="control-group">
+                                                    <label class="form_label control-label" for="form_zip">{% trans 'admin::compte-utilisateur code postal' %}</label>
+                                                    <div class="controls">
+                                                        <input class="input_element" type="text" name="form_zip" id="form_zip" value="{{ user.get_zipcode() }}" />
+                                                        <p class="form_alert help-block"></p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="control-group">
+                                                    <label class="form_label control-label" for="form_city">{% trans 'admin::compte-utilisateur ville' %}</label>
+                                                    <div class="controls">
+                                                        <input class="input_element geoname_field" type="text" name="form_geonameid" id="form_geonameid" geonameid="{{ user.get_geonameid() }}" value="{{ geonames.name_from_id(user.get_geonameid()) }}" />
+                                                        <p class="form_alert help-block"></p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="control-group">
+                                                    <label class="form_label control-label"></label>
+                                                    <div class="controls">
+                                                        <div id="test_city" style="position: absolute; width: 200px; max-height: 200px; overflow-y: auto; z-index: 99999;"></div>
+                                                        <p class="form_alert help-block"></p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="control-group">
+                                                    <label class="form_label control-label" for="form_function">{% trans 'admin::compte-utilisateur poste' %}</label>
+                                                    <div class="controls">
+                                                        <input class="input_element" type="text" name="form_function" id="form_function" value="{{ user.get_position() }}" />
+                                                        <p class="form_alert help-block"></p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="control-group">
+                                                    <label class="form_label control-label" for="form_company">{% trans 'admin::compte-utilisateur societe' %}</label>
+                                                    <div class="controls">
+                                                        <input class="input_element" type="text" name="form_company" id="form_company" value="{{ user.get_company() }}" />
+                                                        <p class="form_alert help-block"></p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="control-group">
+                                                    <label class="form_label control-label" for="form_activity">{% trans 'admin::compte-utilisateur activite' %}</label>
+                                                    <div class="controls">
+                                                        <input class="input_element" type="text" name="form_activity" id="form_activity" value="{{ user.get_job() }}" />
+                                                        <p class="form_alert help-block"></p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="control-group">
+                                                    <label class="form_label control-label" for="form_phone">{% trans 'admin::compte-utilisateur telephone' %}</label>
+                                                    <div class="controls">
+                                                        <input class="input_element" type="text" name="form_phone" id="form_phone" value="{{ user.get_tel() }}" />
+                                                        <p class="form_alert help-block"></p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="control-group">
+                                                    <label class="form_label control-label" for="form_fax">{% trans 'admin::compte-utilisateur fax' %}</label>
+                                                    <div class="controls">
+                                                        <input class="input_element" type="text" name="form_fax" id="form_fax" value="{{ user.get_fax() }}" />
+                                                        <p class="form_alert help-block"></p>
+                                                    </div>
+                                                </div>
+
+                                                <legend>{% trans 'Notification par email' %}</legend>
+
                                                 {% for notification_group, nots in notifications%}
-                                                    <tr>
-                                                        <td style="font-weight: bold;" colspan="3">{{ notification_group }}</td>
-                                                    </tr>
+                                                    <p style="font-weight: bold;">{{ notification_group }}</p>
                                                     {% for notification in nots %}
-                                                        <tr>
-                                                            <td class="form_label" colspan="2"><label for="notif_{{ notification['id'] }}">{{ notification['description'] }}</label></td>
-                                                            <td class="form_input">
-                                                                <input type="checkbox" id="notif_{{ notification['id'] }}" name="notifications[{{ notification['id'] }}]" {% if not user.getPrefs('notification_' ~ notification['id']) == '0' %}checked{% endif %} value="1"/>
-                                                            </td>
-                                                        </tr>
+                                                        <div class="control-group">
+                                                            <label class="form_label control-label"></label>
+                                                            <div class="controls">
+                                                                <label class="checkbox" for="notif_{{ notification['id'] }}">
+                                                                    <input type="checkbox" id="notif_{{ notification['id'] }}" name="notifications[{{ notification['id'] }}]" {% if not user.getPrefs('notification_' ~ notification['id']) == '0' %}checked{% endif %} value="1"/>
+                                                                    {{ notification['description'] }}
+                                                                </label>
+                                                                <p class="form_alert help-block"></p>
+                                                            </div>
+                                                        </div>
                                                     {% endfor %}
                                                 {% endfor %}
-                                                <tr>
-                                                    <td colspan="3"></td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="form_label"><label for="form_address">{% trans 'admin::compte-utilisateur adresse' %}</label></td>
-                                                    <td class="form_input">
-                                                        <input  class="input_element" type="text" name="form_address" id="form_address" value="{{ user.get_address() }}"/>
-                                                    </td>
-                                                    <td class="form_alert"></td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="form_label"><label for="form_zip">{% trans 'admin::compte-utilisateur code postal' %}</label></td>
-                                                    <td class="form_input">
-                                                        <input  class="input_element" type="text" name="form_zip" id="form_zip" value="{{ user.get_zipcode() }}"/>
-                                                    </td>
-                                                    <td class="form_alert"></td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="form_label"><label for="form_city">{% trans 'admin::compte-utilisateur ville' %}</label></td>
-                                                    <td class="form_input">
-                                                        <input id="form_geonameid" type="text" geonameid="{{ user.get_geonameid() }}" value="{{ geonames.name_from_id(user.get_geonameid()) }}" class="input_element geoname_field" name="form_geonameid">
-                                                    </td>
-                                                    <td class="form_alert"></td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="form_label"></td>
-                                                    <td class="form_input"><div id="test_city" style="position: absolute; width: 200px; max-height: 200px; overflow-y: auto; z-index: 99999;"></div></td>
-                                                    <td class="form_alert"></td>
-                                                </tr>
-                                                <tr>
-                                                    <td colspan="3">
-                                                </tr>
-                                                <tr>
-                                                    <td class="form_label"><label for="form_function">{% trans 'admin::compte-utilisateur poste' %}</label></td>
-                                                    <td class="form_input">
-                                                        <input  class="input_element" type="text" name="form_function" id="form_function" value="{{ user.get_position() }}"/>
-                                                    </td>
-                                                    <td class="form_alert"></td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="form_label"><label for="form_company">{% trans 'admin::compte-utilisateur societe' %}</label></td>
-                                                    <td class="form_input">
-                                                        <input  class="input_element" type="text" name="form_company" id="form_company" value="{{ user.get_company() }}"/>
-                                                    </td>
-                                                    <td class="form_alert"></td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="form_label"><label for="form_activity">{% trans 'admin::compte-utilisateur activite' %}</label></td>
-                                                    <td class="form_input">
-                                                        <input  class="input_element" type="text" name="form_activity" id="form_activity" value="{{ user.get_job() }}"/>
-                                                    </td>
-                                                    <td class="form_alert"></td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="form_label"><label for="form_phone">{% trans 'admin::compte-utilisateur telephone' %}</label></td>
-                                                    <td class="form_input">
-                                                        <input  class="input_element" type="text" name="form_phone" id="form_phone" value="{{ user.get_tel() }}"/>
-                                                    </td>
-                                                    <td class="form_alert"></td>
-                                                </tr>
-                                                <tr>
-                                                    <td class="form_label"><label for="form_fax">{% trans 'admin::compte-utilisateur fax' %}</label></td>
-                                                    <td class="form_input">
-                                                        <input  class="input_element" type="text" name="form_fax" id="form_fax" value="{{ user.get_fax() }}"/>
-                                                    </td>
-                                                    <td class="form_alert"></td>
-                                                </tr>
-                                                <tr>
-                                                    <td colspan="3">
-                                                </tr>
+
+                                                <legend>{% trans 'FTP' %}</legend>
+
+
+
+                                            <table style="margin: 20px auto;">
 
                                                 <tr>
                                                     <td class="form_label"><label for="form_activeFTP">{% trans 'admin::compte-utilisateur:ftp: Activer le compte FTP' %}</label></td>
@@ -481,12 +485,15 @@
                                                     </td>
                                                 </tr>
                                             </table>
-                                            <div style="text-align: center; margin: 5px 0;">
+
+
+                                            <div class="form-actions" style="background-color: transparent;">
                                                 <input type="submit" class="btn btn-info" value="{% trans 'boutton::valider' %}">
                                             </div>
+
+                                           </fieldset>
                                         </form>
                                     </td>
-
                                 </tr>
                             </table>
                         </div>