diff --git a/scipost/templates/scipost/change_password.html b/scipost/templates/scipost/change_password.html
index c0e94de5a9504fcd7bc707c9e250539acf6bfbab..ffac2c40459b6a3d8c61fa8ddc8f8d6f517494aa 100644
--- a/scipost/templates/scipost/change_password.html
+++ b/scipost/templates/scipost/change_password.html
@@ -6,26 +6,16 @@
 
 {% block content %}
 
-{% if ack %}
-    <div class="row">
-        <div class="col-12">
-            <h1>Your SciPost password has been successfully changed</h1>
-        </div>
-    </div>
-{% else %}
-    <div class="row">
-        <div class="col-lg-8 offset-lg-2">
-            <h1 class="highlight">Change your SciPost password</h1>
-            {% if errormessage %}
-              <p class="text-danger">{{ errormessage }}</p>
-            {% endif %}
-            <form action="{% url 'scipost:change_password' %}" method="post">
-                {% csrf_token %}
-                {{form|bootstrap}}
-                <input type="submit" class="btn btn-secondary" value="Change" />
-            </form>
-        </div>
+<div class="row">
+    <div class="col-lg-8 offset-lg-2">
+        <h1 class="highlight">Change your SciPost password</h1>
+
+        <form action="{% url 'scipost:change_password' %}" method="post">
+            {% csrf_token %}
+            {{form|bootstrap}}
+            <input type="submit" class="btn btn-secondary" value="Change" />
+        </form>
     </div>
-{% endif %}
+</div>
 
 {% endblock content %}
diff --git a/scipost/templates/scipost/reset_password.html b/scipost/templates/scipost/reset_password.html
index 429ed46c71c7a1f728fdb45bd427a4b18bc62ffd..e8169dba2c0608cf7b3b4d23b8c83c65d12f15f8 100644
--- a/scipost/templates/scipost/reset_password.html
+++ b/scipost/templates/scipost/reset_password.html
@@ -2,20 +2,20 @@
 
 {% block pagetitle %}: Reset Password{% endblock pagetitle %}
 
-{% block bodysup %}
-
 {% load bootstrap %}
 
-<div class="container">
-    <div class="row">
-        <div class="col-md-4">
-  <h3>Reset password request form</h3>
-  <form method="post">
-    {% csrf_token %}
-    {{ form|bootstrap }}
-    <input class="btn btn-primary" type="submit" value="Submit" />
-  </form>
+{% block content %}
+
+
+<div class="row">
+    <div class="col-md-4 offset-md-4">
+          <h3>Reset password request form</h3>
+          <form method="post">
+            {% csrf_token %}
+            {{ form|bootstrap }}
+            <input class="btn btn-primary" type="submit" value="Submit" />
+          </form>
         </div>
-    </div>
 </div>
-{% endblock bodysup %}
+
+{% endblock %}
diff --git a/scipost/templates/scipost/reset_password_complete.html b/scipost/templates/scipost/reset_password_complete.html
index f675ab9967a7677319b1e252b57c52086aef1a33..dd226a8df6f40d4867d08a24b794f52fc3889a0a 100644
--- a/scipost/templates/scipost/reset_password_complete.html
+++ b/scipost/templates/scipost/reset_password_complete.html
@@ -3,5 +3,5 @@
 {% block pagetitle %}: Reset password complete{% endblock pagetitle %}
 
 {% block bodysup %}
-<p>You have successfully reset your password.</p>
+    <p>You have successfully reset your password.</p>
 {% endblock bodysup %}
diff --git a/scipost/templates/scipost/reset_password_confirm.html b/scipost/templates/scipost/reset_password_confirm.html
index e302efffc0b6085d18bfd325611f20a61554f470..60afebc99f0f143ac49d577665f4475f7e3a6cb2 100644
--- a/scipost/templates/scipost/reset_password_confirm.html
+++ b/scipost/templates/scipost/reset_password_confirm.html
@@ -2,16 +2,22 @@
 
 {% block pagetitle %}: Reset password confirm{% endblock pagetitle %}
 
-{% block bodysup %}
-<section>
+{% load bootstrap %}
+
+{% block content %}
+
+<div class="row">
+    <div class="col-md-6 offset-md-3">
     {% if validlink %}
         <form method="post">
             {% csrf_token %}
-            {{ form.as_p }}
-            <button type="submit">Submit</button>
+            {{ form|bootstrap }}
+            <input class="btn btn-secondary" type="submit" value="Submit">
         </form>
     {% else %}
         <p>This reset link is no longer valid!</p>
     {% endif %}
-</section>
-{% endblock bodysup %}
+    </div>
+</div>
+
+{% endblock content %}