diff --git a/templates/reset_password/request.html.twig b/templates/reset_password/request.html.twig
index 4afe4b8ebf93d5a075fff2527afdc01b21200835..24b35096556e70b28cd7f89636cb1dcf7723a1f8 100644
--- a/templates/reset_password/request.html.twig
+++ b/templates/reset_password/request.html.twig
@@ -8,15 +8,23 @@
     {% endfor %}
     <h1 class="m-auto mb-4 mt-4 col-6">Reset your password</h1>
 
-    {{ form_start(requestForm, {'attr': {'class': 'd-flex flex-column justify-content-center'}}) }}
-        {{ form_row(requestForm.email, {'row_attr': {'class' : 'm-auto mb-2 mt-4 col-6'}}) }}
-        <div class="m-auto mb-4 mt-4 col-6">
-            <small>
-                Enter your email address and we will send you a
-                link to reset your password.
-            </small>
-        </div>
-
-        <button class="btn btn-primary m-auto mb-4 mt-4 col-2" type="submit">Reset password</button>
-    {{ form_end(requestForm) }}
-{% endblock %}
+    <div class="d-flex flex-column justify-content-center">
+
+        {{ form_start(requestForm, {'attr': {novalidate: 'novalidate'}}) }}
+            <div class="m-auto mb-2 mt-4 col-6">
+                {{ form_row(requestForm.email) }}
+            </div>
+
+            <div class="m-auto mb-4 mt-4 col-6">
+                <small>
+                    Enter your email address and we will send you a
+                    link to reset your password.
+                </small>
+            </div>
+
+            <button class="d-flex flex-column btn btn-primary m-auto mt-2 mb-4 col-2" type="submit">Reset password</button>
+
+        {{ form_end(requestForm) }}
+    </div>
+
+    {% endblock %}
diff --git a/templates/reset_password/reset.html.twig b/templates/reset_password/reset.html.twig
index 615ad638152427abb780e49c09cf47c067d99219..b97a360e3fb31418d6d87de71ad8d82094b0d1f3 100644
--- a/templates/reset_password/reset.html.twig
+++ b/templates/reset_password/reset.html.twig
@@ -3,10 +3,17 @@
 {% block title %}Reset your password{% endblock %}
 
 {% block body %}
-    <h1>Reset your password</h1>
+    <h1 class="m-auto mb-4 col-6">Reset your password</h1>
+
+    <div class="d-flex flex-column justify-content-center">
+        {{ form_start(resetForm, {'attr': {novalidate: 'novalidate'}}) }}
+        <div class="m-auto mb-4 col-6">
+            {{ form_row(resetForm.plainPassword) }}
+        </div>
+        <button class="d-flex flex-column btn btn-primary m-auto mt-2 mb-4 col-2" type="submit">
+            Reset password
+        </button>
+        {{ form_end(resetForm) }}
+    </div>
 
-    {{ form_start(resetForm) }}
-        {{ form_row(resetForm.plainPassword) }}
-        <button class="btn btn-primary">Reset password</button>
-    {{ form_end(resetForm) }}
 {% endblock %}