diff --git a/src/web/pages/resources/common.css b/src/web/pages/resources/common.css
index 3b4d15737..c4b1650f1 100644
--- a/src/web/pages/resources/common.css
+++ b/src/web/pages/resources/common.css
@@ -184,6 +184,7 @@ h1 a.back {
 
 label {
     display: block;
+    margin-bottom: 0.2em;
 }
 
 a, a:visited {
@@ -203,7 +204,6 @@ pre {
 input, button, a.button {
     display: inline-block;
     padding: 0.5em;
-    margin-bottom: 0.5em;
 
     font-size: inherit;
     font-family: inherit;
@@ -236,6 +236,7 @@ button, a.button {
     background-color: var(--c1);
     transition: opacity .2s;
     text-align: center;
+    margin: 0.5rem 0;
 
     &:enabled:hover {
         opacity: 0.8;
diff --git a/src/web/pages/resources/login.css b/src/web/pages/resources/login.css
index ab7a8b417..ab5123885 100644
--- a/src/web/pages/resources/login.css
+++ b/src/web/pages/resources/login.css
@@ -12,7 +12,6 @@
     align-items: center;
     text-align: center;
     color: var(--secondary);
-    margin-bottom: 0.5em;
 }
 
 .text-rule::before, .text-rule::after {
diff --git a/src/web/pages/templates/register.html.j2 b/src/web/pages/templates/register.html.j2
index a16d0d50a..67f189885 100644
--- a/src/web/pages/templates/register.html.j2
+++ b/src/web/pages/templates/register.html.j2
@@ -78,6 +78,11 @@ Sign up
                     <button type="submit" name="flow" value="trusted">Continue with a registration token</button>
                 {% endif %}
             </form>
+            {% if !is_first_run %}
+                <div class="centered-links">
+                    <a href="{{ crate::ROUTE_PREFIX }}/account/login">I already have an account</a>
+                </div>
+            {% endif %}
         {% when RegisterBody::DetailsPrompt { username, require_email, flow, terms, validation_errors } %}
             {% let validation_errors = validation_errors.clone() %}
             {% let field_errors = validation_errors.field_errors() %}
@@ -99,7 +104,7 @@ Sign up
                         <span>:{{ server_name }}</span>
                     </span>
                     {{ form::errors(field_errors, std::borrow::Cow::Borrowed("username")) }}
-                    <small><b>Note:</b> Your username cannot be changed after you create your account.</small>
+                    <small>Your username cannot be changed after you create your account.</small>
                 </p>
                 {% if !is_first_run %}
                     <p>
@@ -175,10 +180,5 @@ Sign up
                 <button type="submit">Continue</button>
             </form>
     {% endmatch %}
-    {% if !is_first_run %}
-        <div class="centered-links">
-            <a href="{{ crate::ROUTE_PREFIX }}/account/login">I already have an account</a>
-        </div>
-    {% endif %}
 </div>
 {%- endblock -%}