diff --git a/rdrf/rdrf/templates/registration/password_reset_email.html b/rdrf/rdrf/templates/registration/password_reset_email.html
index 834c8495a..7e4863677 100644
--- a/rdrf/rdrf/templates/registration/password_reset_email.html
+++ b/rdrf/rdrf/templates/registration/password_reset_email.html
@@ -1,25 +1,20 @@
+{# NB All whitespace and indentation are rendered in the final email. #}
 {% load i18n full_url password_reset_timeout %}{% autoescape off %}
-    {% trans "Hello Mr/Ms" %} {{ user.last_name }},
+{% trans "Hello Mr/Ms" %} {{ user.last_name }},
 
-    {% blocktrans trimmed %}
-        You're receiving this email because you requested a password reset for your user account.
-    {% endblocktrans %}
+{% blocktrans trimmed %}You're receiving this email because you requested a password reset for your user account.{% endblocktrans %}
 
-    {% trans "Please go to the following page and choose a new password:" %}
-    {% block reset_link %}
-        {% full_url 'password_reset_confirm' uidb64=uid token=token %}
-    {% endblock %}
-    {% trans "Your username, in case you've forgotten:" %} {{ user.get_username }}
+{% trans "Please go to the following page and choose a new password:" %}
+{% block reset_link %}{% full_url 'password_reset_confirm' uidb64=uid token=token %}{% endblock %}
 
-    {% timeuntil_expiry as timeuntil_expiry %}
-    {% if timeuntil_expiry %}
-        {% blocktrans trimmed with timeuntil_expiry=timeuntil_expiry %}
-            Note that, for security reasons, this link is only valid for {{ timeuntil_expiry }}.
-        {% endblocktrans %}
-    {% endif %}
+{% trans "Your username, in case you've forgotten:" %} {{ user.get_username }}
+{% timeuntil_expiry as timeuntil_expiry %}
+{% if timeuntil_expiry %}
+{% blocktrans trimmed with timeuntil_expiry=timeuntil_expiry %}Note that, for security reasons, this link is only valid for {{ timeuntil_expiry }}.{% endblocktrans %}
+{% endif %}
 
-    {% trans "Thanks for using our site!" %}
+{% trans "Thanks for using our site!" %}
 
-    {% blocktrans %}The {{ site_name }} team.{% endblocktrans %}
+{% blocktrans %}The {{ site_name }} team.{% endblocktrans %}
 
 {% endautoescape %}