diff --git a/src/templates/common/elements/password_rules.html b/src/templates/common/elements/password_rules.html
new file mode 100644
index 0000000000..fab177b6a6
--- /dev/null
+++ b/src/templates/common/elements/password_rules.html
@@ -0,0 +1,14 @@
+<li>
+    {% blocktrans trimmed with password_length=request.press.password_length %}
+        Your password should be {{ password_length }} characters long.
+    {% endblocktrans %}</li>
+{% if request.press.password_upper %}
+    <li>{% blocktrans trimmed %}
+        Your password should contain at least one upper case letter.
+    {% endblocktrans %}</li>
+{% endif %}
+{% if request.press.password_number %}
+    <li>{% blocktrans trimmed %}
+        Your password should contain at least one number.
+    {% endblocktrans %}</li>
+{% endif %}
\ No newline at end of file
diff --git a/src/themes/OLH/templates/core/accounts/register.html b/src/themes/OLH/templates/core/accounts/register.html
index 2cb43771b2..aef9c4269e 100644
--- a/src/themes/OLH/templates/core/accounts/register.html
+++ b/src/themes/OLH/templates/core/accounts/register.html
@@ -26,9 +26,7 @@ <h5>{% trans "Register for an account with" %} {{ request.press.name }}.</h5>
 
                         <p>{% trans "Password Rules" %}:</p>
                         <ul class="no-top-margin">
-                            <li>{% blocktrans with password_length=request.press.password_length %}Your password should be {{ password_length }} characters long.{% endblocktrans %}</li>
-                            {% if request.press.password_upper %}<li>{% blocktrans %}Your password should contain at least one upper case letter."{% endblocktrans %} %}</li>{% endif %}
-                            {% if request.press.password_number %}<li>{% blocktrans %}Your password should contain at least one number." %}{% endblocktrans %}</li>{% endif %}
+                            {% include "common/elements/password_rules.html" %}
                         </ul>
                         <p>{% blocktrans %}For more information read our <a href="#" data-open="password-modal">password guide</a>.{% endblocktrans %}</p>
 
diff --git a/src/themes/clean/templates/core/accounts/register.html b/src/themes/clean/templates/core/accounts/register.html
index fd56ba4bce..76ff181bc5 100644
--- a/src/themes/clean/templates/core/accounts/register.html
+++ b/src/themes/clean/templates/core/accounts/register.html
@@ -17,9 +17,7 @@
                             <h5>{% trans "Register for an account with" %} {{ request.press.name }}.</h5>
                             <p>{% trans "Password Rules" %}:</p>
                             <ul class="no-top-margin">
-                                <li>{% blocktrans with password_length=request.press.password_length %}Your password should be {{ password_length }} characters long.{% endblocktrans %}</li>
-                                {% if request.press.password_upper %}<li>{% blocktrans %}Your password should contain at least one upper case letter."{% endblocktrans %} %}</li>{% endif %}
-                                {% if request.press.password_number %}<li>{% blocktrans %}Your password should contain at least one number." %}{% endblocktrans %}</li>{% endif %}
+                               {% include "common/elements/password_rules.html" %}
                             </ul>
                             <p>{% blocktrans %}For more information read our <a href="#" data-toggle="modal" data-target="#passwordmodal">password guide</a>.{% endblocktrans %}</p>
 
diff --git a/src/themes/material/templates/core/accounts/register.html b/src/themes/material/templates/core/accounts/register.html
index b9db875607..de2ad43c8c 100644
--- a/src/themes/material/templates/core/accounts/register.html
+++ b/src/themes/material/templates/core/accounts/register.html
@@ -19,13 +19,13 @@
                     {% endif %}
                     <p>{% trans "Password Rules" %}:</p>
                     <ul class="no-top-margin browser-default">
-                        <li>{% blocktrans with password_length=request.press.password_length %}Your password should be {{ password_length }} characters long.{% endblocktrans %}</li>
-                        {% if request.press.password_upper %}<li>{% blocktrans %}Your password should contain at least one upper case letter."{% endblocktrans %} %}</li>{% endif %}
-                        {% if request.press.password_number %}<li>{% blocktrans %}Your password should contain at least one number." %}{% endblocktrans %}</li>{% endif %}
+                        {% include "common/elements/password_rules.html" %}
                     </ul>
-                    <p>{% blocktrans %}For more information read our
-                        <a href="#passwordmodal" class="modal-trigger">password guide</a>
-                        .{% endblocktrans %}</p>
+                    <p>
+                        {% blocktrans trimmed %}For more information read our
+                        <a href="#" data-target="passwordmodal" class="modal-trigger">password
+                            guide</a>.{% endblocktrans %}
+                    </p>
                     <form method="POST">
                         {% include "elements/forms/errors.html" %}
                         {% csrf_token %}