diff --git a/src/web/pages/templates/change_email_validate.html.j2 b/src/web/pages/templates/change_email_validate.html.j2
index 3664c2fa4..02fe63c23 100644
--- a/src/web/pages/templates/change_email_validate.html.j2
+++ b/src/web/pages/templates/change_email_validate.html.j2
@@ -11,7 +11,9 @@ Change your email
     {% match body %}
         {% when ChangeEmailValidateBody::ValidationPending { session_id, client_secret, validation_error } %}
             <p>
-                A message has been sent to your new email address with a validation link. If you do not receive the email:
+                A message has been sent to your new email address with a validation link.
+                To finish changing your email, click the link and then return to this page.
+                If you do not receive the email:
                 <ul>
                     <li>Check your spam filter.</li>
                 </ul>
diff --git a/src/web/pages/templates/change_password.html.j2 b/src/web/pages/templates/change_password.html.j2
index db2b37867..8065dcfab 100644
--- a/src/web/pages/templates/change_password.html.j2
+++ b/src/web/pages/templates/change_password.html.j2
@@ -10,16 +10,18 @@ Change your password
 
 {%- block content -%}
 <div class="panel narrow">
-    <h1>Change your password</h1>
+    <h1>Change your password <a class="back" href="{{ crate::ROUTE_PREFIX }}/account/">Back</a></h1>
     {{ user_card }}
     {% match body %}
         {% when ChangePasswordBody::Form(reset_form) %}
-        {{ reset_form }}
-        <a class="reset-password" href="reset/"><i>Forgot your password?</i></a>
+            {{ reset_form }}
+            <div class="centered-links">
+                <a href="{{ crate::ROUTE_PREFIX }}/account/password/reset/">Forgot your password?</a>
+            </div>
         {% when ChangePasswordBody::Success %}
-        <p>
-            Your password has been changed successfully. <a href="{{ crate::ROUTE_PREFIX }}/account/">Back</a>
-        </p>
+            <p>
+                Your password has been changed successfully. <a href="{{ crate::ROUTE_PREFIX }}/account/">Back</a>
+            </p>
     {% endmatch %}
 </div>
 {%- endblock -%}
diff --git a/src/web/pages/templates/register.html.j2 b/src/web/pages/templates/register.html.j2
index eabadd7b1..2b94e69df 100644
--- a/src/web/pages/templates/register.html.j2
+++ b/src/web/pages/templates/register.html.j2
@@ -163,5 +163,8 @@ Sign up
                 <button type="submit">Continue</button>
             </form>
     {% endmatch %}
+    <div class="centered-links">
+        <a href="{{ crate::ROUTE_PREFIX }}/account/login">I already have an account</a>
+    </div>
 </div>
 {%- endblock -%}
diff --git a/src/web/pages/templates/register_email_validate.html.j2 b/src/web/pages/templates/register_email_validate.html.j2
index ef716bc02..17e8fe062 100644
--- a/src/web/pages/templates/register_email_validate.html.j2
+++ b/src/web/pages/templates/register_email_validate.html.j2
@@ -8,7 +8,7 @@ Confirm your email
 <div class="panel narrow">
     <h1>Confirm your email</h1>
     <p>
-        A message has been sent to your new email address with a validation link.
+        A message has been sent to your email address with a validation link.
         To finish creating your account, click the link and then return to this page.
         If you do not receive the email:
         <ul>
diff --git a/src/web/pages/templates/reset_password_validate.html.j2 b/src/web/pages/templates/reset_password_validate.html.j2
index dde49fc4b..135a5235a 100644
--- a/src/web/pages/templates/reset_password_validate.html.j2
+++ b/src/web/pages/templates/reset_password_validate.html.j2
@@ -10,7 +10,9 @@ Reset your password
     {% match body %}
         {% when ResetPasswordValidateBody::ValidationPending { session_id, client_secret, validation_error } %}
             <p>
-                Check your inbox for the validation email. If you do not receive the email:
+                A message has been sent to your email address with a validation link.
+                To finish resetting your password, click the link and then return to this page.
+                If you do not receive the email:
                 <ul>
                     <li>Check your spam filter.</li>
                     <li>Your Matrix account may not be associated with an email address. Contact your homeserver's
@@ -30,7 +32,7 @@ Reset your password
             {{ form }}
         {% when ResetPasswordValidateBody::ResetSuccess { user_card } %}
             {{ user_card }}
-            <p>Your password has been reset successfully.</p>
+            <p>Your password has been reset successfully. <a href="{{ crate::ROUTE_PREFIX }}/account/login">Return to login</a></p>
     {% endmatch %}
 </div>
 {%- endblock -%}