diff --git a/src/newsreader/accounts/templates/accounts/components/login-form.html b/src/newsreader/accounts/templates/accounts/components/login-form.html
index d09974a..87dceb9 100644
--- a/src/newsreader/accounts/templates/accounts/components/login-form.html
+++ b/src/newsreader/accounts/templates/accounts/components/login-form.html
@@ -10,7 +10,7 @@
 
     <fieldset class="fieldset form__fieldset">
       <a class="link" href="{% url 'accounts:password-reset' %}">
-        <small class="small">I forgot my password</small>
+        <small class="small">{% trans "I forgot my password" %}</small>
       </a>
     </fieldset>
   </section>
diff --git a/src/newsreader/templates/components/form/form.html b/src/newsreader/templates/components/form/form.html
index 3c729ae..d854eb1 100644
--- a/src/newsreader/templates/components/form/form.html
+++ b/src/newsreader/templates/components/form/form.html
@@ -22,13 +22,11 @@
 
       {% for field in form.visible_fields %}
         <fieldset class="fieldset form__fieldset">
-          <label class="label form__label" for="{{ field.name }}">
-            {{ field.label }}
-          </label>
+          {% include "components/form/label.html" %}
 
           {{ field.errors }}
           {{ field }}
-          <small class="small helptext">{{ field.help_text }}</small>
+          {% include "components/form/help-text.html" %}
         </fieldset>
       {% endfor %}
     </section>
diff --git a/src/newsreader/templates/components/form/help-text.html b/src/newsreader/templates/components/form/help-text.html
new file mode 100644
index 0000000..eb02d82
--- /dev/null
+++ b/src/newsreader/templates/components/form/help-text.html
@@ -0,0 +1 @@
+<small class="small helptext">{{ field.help_text }}</small>
diff --git a/src/newsreader/templates/components/form/label.html b/src/newsreader/templates/components/form/label.html
new file mode 100644
index 0000000..4058b29
--- /dev/null
+++ b/src/newsreader/templates/components/form/label.html
@@ -0,0 +1,3 @@
+<label class="label form__label" for="{{ field.name }}">
+  {{ field.label }}
+</label>