diff --git a/modoboa/templates/registration/password_reset_confirm.html b/modoboa/templates/registration/password_reset_confirm.html
index c219b77d2..de3f83f71 100644
--- a/modoboa/templates/registration/password_reset_confirm.html
+++ b/modoboa/templates/registration/password_reset_confirm.html
@@ -5,19 +5,26 @@
 {% block main_content %}
   <div class="login-box">
     {% if validlink %}
-      <h3 class="text-center">{% trans "Change password" %}</h3>
+      <h2>{% trans "Change password" %}</h2>
       <form method="post" style="margin-top: 20px">
         {% csrf_token %}
         <div class="input-group">
           {% render_field form.new_password1 %}
         </div>
-        <div class="input-group">
-          {% render_field form.new_password2 %}
+        <div class="input-group{% if form.new_password2.errors %} error{% endif %}">
+          {{ form.new_password2 }}
+          {% if form.new_password2.errors %}
+            <p class="error-message">
+              {% for error in form.new_password2.errors %}
+                {{ error }}
+              {% endfor %}
+            </p>
+          {% endif %}
         </div>
-        <button class="btn" type="submit">{% trans "Submit" %}</button>
+        <button class="btn btn-primary" type="submit">{% trans "Submit" %}</button>
       </form>
     {% else %}
-      <div class="alert alert-danger">
+      <div class="mt alert-box">
         {% blocktrans trimmed %}
           The password reset link was invalid, possibly because it has already been used.
           Please request a new password reset.
diff --git a/modoboa/templates/registration/password_reset_confirm_code.html b/modoboa/templates/registration/password_reset_confirm_code.html
index 0e4fd9374..f426089bd 100644
--- a/modoboa/templates/registration/password_reset_confirm_code.html
+++ b/modoboa/templates/registration/password_reset_confirm_code.html
@@ -3,31 +3,34 @@
 {% load i18n form_tags %}
 
 {% block main_content %}
-  <form method="post" style="margin-top: 20px">
-    {% csrf_token %}
-    <div class="col-sm-offset-4 col-sm-5">
-      <div class="form-group{% if form.code.errors %} has-error{% endif %}">
-        <label for="id_code">{{ form.code.label }} *</label>
-        {{ form.code }}
-        {% if form.code.errors %}
+  <div class="login-box">
+    <h2>{% translate "Forgot password?" %}</h2>
+    <form method="post" style="margin-top: 20px">
+      {% csrf_token %}
+      <div class="col-sm-offset-4 col-sm-5">
+        <div class="input-group{% if form.code.errors %} error{% endif %}">
+          <label for="id_code">{{ form.code.label }} *</label>
+          {{ form.code }}
+          {% if form.code.errors %}
+            <p class="error-message">
+              {% for error in form.code.errors %}
+                {{ error }}
+              {% endfor %}
+            </p>
+          {% endif %}
           <p class="help-block">
-            {% for error in form.code.errors %}
-              {{ error }}
-            {% endfor %}
+            {% blocktrans trimmed %}
+              Enter the code you've just received by SMS
+            {% endblocktrans %}
           </p>
-        {% endif %}
-        <p class="help-block">
-          {% blocktrans trimmed %}
-            Enter the code you've just received by SMS
-          {% endblocktrans %}
-        </p>
+        </div>
+        <button type="submit" class="btn btn-primary">{% trans "Submit" %}</button>
+        <a class="pull-right mt" id="resend_code" href="{% url 'password_reset_resend_code' %}">
+          {% trans "Resend code" %}
+        </a>
       </div>
-      <button type="submit" class="btn btn-primary col-lg-12">{% trans "Submit" %}</button>
-      <a class="pull-right" id="resend_code" href="{% url 'password_reset_resend_code' %}">
-        {% trans "Resend code" %}
-      </a>
-    </div>
-  </form>
+    </form>
+  </div>
 {% endblock %}
 
 {% block extra_js %}