diff --git a/hypha/apply/templates/forms/includes/field.html b/hypha/apply/templates/forms/includes/field.html
index 704df164ef589e5588928c4bf47bfaa37f17e3f3..ea87eb025efecd49e585d62d4c98eebec0e33547 100644
--- a/hypha/apply/templates/forms/includes/field.html
+++ b/hypha/apply/templates/forms/includes/field.html
@@ -56,7 +56,11 @@
 
                 {{ field }}
 
-                {% if field.errors %}<h6 class="form__error-text">{{ field.errors.as_text|linebreaksbr }}</h6>{% endif %}
+                {% if field.errors %}
+                    <p class="form__error-text">
+                        {{ field.errors.as_text|linebreaksbr }}
+                    </p>
+                {% endif %}
                 {% if widget_type == 'clearable_file_input' or widget_type == 'multi_file_input' %}
                     <output class="form__file-list"></output>
                 {% endif %}
diff --git a/hypha/apply/users/templates/users/change_password.html b/hypha/apply/users/templates/users/change_password.html
index aefff426f70fc27f1261c9413356060108d1c8fd..821e42ea4d9357bdd02f679f58fbd54c315bdb52 100644
--- a/hypha/apply/users/templates/users/change_password.html
+++ b/hypha/apply/users/templates/users/change_password.html
@@ -14,7 +14,7 @@
     {% endadminbar %}
 
     <div class="wrapper mt-6 max-w-2xl">
-        <form class="form" action="" method="POST" novalidate>
+        <form class="form form--error-inline" action="" method="POST" novalidate>
             {% if redirect_url %}
                 <input type="hidden" value="{{ redirect_url }}" name="next">
             {% endif %}
diff --git a/hypha/static_src/sass/components/_form.scss b/hypha/static_src/sass/components/_form.scss
index abcac638ed2d54698869ff1e52891f4955666ccf..34c002b5fe395bda1ae92f4b7ab2b32396ada0f5 100644
--- a/hypha/static_src/sass/components/_form.scss
+++ b/hypha/static_src/sass/components/_form.scss
@@ -35,6 +35,7 @@
     &--error-inline {
         // stylelint-disable-next-line selector-class-pattern
         .form__error-text {
+            padding-left: 0.5rem;
             position: relative;
             max-width: 100%;