diff --git a/src/web/pages/resources/common.css b/src/web/pages/resources/common.css
index ac72eba92..3c0a531f1 100644
--- a/src/web/pages/resources/common.css
+++ b/src/web/pages/resources/common.css
@@ -214,11 +214,6 @@ button, a.button {
     text-align: center;
     margin: 0.5rem 0;
 
-    &:enabled:hover {
-        opacity: 0.8;
-        cursor: pointer;
-    }
-
     &:disabled {
         color: lightgray;
         background-color: gray;
@@ -226,6 +221,11 @@ button, a.button {
 
     &:not(:disabled) {
         transition: linear color, background-color 0.1s;
+
+        &:hover {
+            opacity: 0.8;
+            cursor: pointer;
+        }
     }
 
     &:visited {
diff --git a/src/web/pages/templates/account.html.j2 b/src/web/pages/templates/account.html.j2
index 5cee286e9..f2a95e59b 100644
--- a/src/web/pages/templates/account.html.j2
+++ b/src/web/pages/templates/account.html.j2
@@ -25,7 +25,7 @@ Your account
                             Your account has no associated email address.
                         {% endif %}
                         {% if email_requirement.may_change() %}
-                            <a href="email/change/">Change your email</a>\
+                            <a href="email/change/">Change your email</a>
                         {% endif %}
                     </p>
                 {% endif %}
diff --git a/src/web/pages/templates/change_password.html.j2 b/src/web/pages/templates/change_password.html.j2
index 8065dcfab..fbbe51683 100644
--- a/src/web/pages/templates/change_password.html.j2
+++ b/src/web/pages/templates/change_password.html.j2
@@ -20,7 +20,7 @@ Change your password
             </div>
         {% when ChangePasswordBody::Success %}
             <p>
-                Your password has been changed successfully. <a href="{{ crate::ROUTE_PREFIX }}/account/">Back</a>
+                Your password has been changed successfully.
             </p>
     {% endmatch %}
 </div>
diff --git a/src/web/pages/templates/error.html.j2 b/src/web/pages/templates/error.html.j2
index 4f38adc72..783963a1e 100644
--- a/src/web/pages/templates/error.html.j2
+++ b/src/web/pages/templates/error.html.j2
@@ -37,6 +37,7 @@
         {% endif %}
 
         <pre style="white-space: pre-wrap"><code>{{ error }}</code></pre>
+        <a href="{{ crate::ROUTE_PREFIX }}/account/">Back to account settings</a>
     </div>
 </div>
 
diff --git a/src/web/pages/templates/login.html.j2 b/src/web/pages/templates/login.html.j2
index 9f118e0bc..6017b6119 100644
--- a/src/web/pages/templates/login.html.j2
+++ b/src/web/pages/templates/login.html.j2
@@ -44,6 +44,9 @@ Log in
                         </p>
                         <button type="submit">Log in</button>
                     </form>
+                    {% if let Some(error) = login_error %}
+                        <small class="error">{{ error }}</small>
+                    {% endif %}
                     <div class="centered-links">
                         {% if registration_available %}
                             {% let query = next.as_ref().map(serde_urlencoded::to_string).transpose().unwrap().unwrap_or_default() %}
@@ -67,6 +70,9 @@ Log in
                         </p>
                         <button type="submit">Continue</button>
                     </form>
+                    {% if let Some(error) = login_error %}
+                        <small class="error">{{ error }}</small>
+                    {% endif %}
                     <div class="centered-links">
                         <a href="{{ crate::ROUTE_PREFIX }}/account/password/reset/">Forgot your password?</a>
                     </div>
@@ -74,8 +80,5 @@ Log in
                     <a class="button" href="{{ redirect_url }}">Continue</a>
             {% endmatch %}
     {% endmatch %}
-    {% if let Some(error) = login_error %}
-        <small class="error">{{ error }}</small>
-    {% endif %}
 </div>
 {%- endblock -%}
diff --git a/src/web/pages/templates/reset_password.html.j2 b/src/web/pages/templates/reset_password.html.j2
index 35634727f..5dc6999b3 100644
--- a/src/web/pages/templates/reset_password.html.j2
+++ b/src/web/pages/templates/reset_password.html.j2
@@ -27,6 +27,7 @@ Reset your password
             <p>
                 To reset your password, contact your homeserver's administrator.
             </p>
+            <a href="{{ crate::ROUTE_PREFIX }}/account/">Back to account settings</a>
     {% endmatch %}
 </div>
 {%- endblock -%}