diff --git a/mellon/templates/mellon/authentication_failed.html b/mellon/templates/mellon/authentication_failed.html
index 8c3f1b8..f2e2d30 100644
--- a/mellon/templates/mellon/authentication_failed.html
+++ b/mellon/templates/mellon/authentication_failed.html
@@ -8,22 +8,22 @@
 {% endblock %}
 
 {% block mellon_content %}
-<div id="mellon-authentication-failure" class="mellon-message">
-  <h2 class="mellon-message-header">{% trans "Authentication failed" %}</h2>
-  <p class="mellon-message-body">
-    {% blocktrans %}The authentication has failed.{% endblocktrans %}
-    {% if reason %}<p class="mellon-reason">{% trans "Reason" %}&nbsp;: {{ reason }}</p>{% endif %}
-  </p>
-  <p class="mellon-message-continue">
-    <a class="mellon-link" href="{{ next_url }}">{% trans "Continue" %}</a>
-  </p>
-  {% if debug %}
-  <!-- DEBUG INFO:
+  <div id="mellon-authentication-failure" class="mellon-message">
+    <h2 class="mellon-message-header">{% trans "Authentication failed" %}</h2>
+    <p class="mellon-message-body">
+      {% blocktrans %}The authentication has failed.{% endblocktrans %}
+      {% if reason %}<p class="mellon-reason">{% trans "Reason" %}&nbsp;: {{ reason }}</p>{% endif %}
+    </p>
+    <p class="mellon-message-continue">
+      <a class="mellon-link" href="{{ next_url }}">{% trans "Continue" %}</a>
+    </p>
+    {% if debug %}
+      <!-- DEBUG INFO:
        Issuer: {{ issuer }}
        Message: {{ status_message }}
        Status codes: {{ status_codes|join:", " }}
        Relaystate: {{ relaystate }}
   -->
-  {% endif %}
-</div>
+    {% endif %}
+  </div>
 {% endblock %}
diff --git a/mellon/templates/mellon/base.html b/mellon/templates/mellon/base.html
index c6828de..0c436c8 100644
--- a/mellon/templates/mellon/base.html
+++ b/mellon/templates/mellon/base.html
@@ -1,11 +1,11 @@
 {% extends template_base|default:"base.html" %}
 
 {% block extra_scripts %}
-   {% block mellon_extra_scripts %}
-   {% endblock %}
+  {% block mellon_extra_scripts %}
+  {% endblock %}
 {% endblock %}
 
 {% block content %}
-   {% block mellon_content %}
-   {% endblock %}
+  {% block mellon_content %}
+  {% endblock %}
 {% endblock %}
diff --git a/mellon/templates/mellon/debug_login.html b/mellon/templates/mellon/debug_login.html
index a5bf180..1d2de5f 100644
--- a/mellon/templates/mellon/debug_login.html
+++ b/mellon/templates/mellon/debug_login.html
@@ -1,10 +1,10 @@
 {% load i18n %}
 
 {% block content %}
-<p><a class="button" href="{% url 'mellon_debug_login' %}">{% trans "Try again" %}</a></p>
-<p><strong>{% trans "Attributes:" %}</strong> <pre>{{ attributes|pprint }}</pre></p>
-<p><strong>{% trans "SAML assertion:" %}</strong> <pre>{{ assertion_dump }}</pre></p>
-<p><strong>{% trans "SAML response:" %}</strong> <pre>{{ response_dump }}</pre></p>
-<p><strong>{% trans "SAML artifact:" %}</strong> <pre>{{ login.msgBody }}</pre></p>
-<p><strong>{% trans "Logs:" %}</strong> <pre>{{ logs }}</pre></p>
+  <p><a class="button" href="{% url 'mellon_debug_login' %}">{% trans "Try again" %}</a></p>
+  <p><strong>{% trans "Attributes:" %}</strong> <pre>{{ attributes|pprint }}</pre></p>
+  <p><strong>{% trans "SAML assertion:" %}</strong> <pre>{{ assertion_dump }}</pre></p>
+  <p><strong>{% trans "SAML response:" %}</strong> <pre>{{ response_dump }}</pre></p>
+  <p><strong>{% trans "SAML artifact:" %}</strong> <pre>{{ login.msgBody }}</pre></p>
+  <p><strong>{% trans "Logs:" %}</strong> <pre>{{ logs }}</pre></p>
 {% endblock %}
diff --git a/mellon/templates/mellon/inactive_user.html b/mellon/templates/mellon/inactive_user.html
index 920660a..33a4a70 100644
--- a/mellon/templates/mellon/inactive_user.html
+++ b/mellon/templates/mellon/inactive_user.html
@@ -2,9 +2,9 @@
 {% load i18n %}
 
 {% block mellon_content %}
-<p>
-  {% blocktrans with name_id=saml_attributes.name_id_content %}Your user, {{ user }}, 
-  is inactive please contact your administrator.
-  {% endblocktrans %}
-</p>
+  <p>
+    {% blocktrans with name_id=saml_attributes.name_id_content %}Your user, {{ user }},
+      is inactive please contact your administrator.
+    {% endblocktrans %}
+  </p>
 {% endblock %}
diff --git a/mellon/templates/mellon/user_not_found.html b/mellon/templates/mellon/user_not_found.html
index 07b43f3..671dba2 100644
--- a/mellon/templates/mellon/user_not_found.html
+++ b/mellon/templates/mellon/user_not_found.html
@@ -2,10 +2,10 @@
 {% load i18n %}
 
 {% block mellon_content %}
-<p>
-  {% blocktrans with name_id=saml_attributes.name_id_content %}No user found for NameID {{ name_id  }}{% endblocktrans %}
-</p>
-<pre style="display: none">
+  <p>
+    {% blocktrans with name_id=saml_attributes.name_id_content %}No user found for NameID {{ name_id  }}{% endblocktrans %}
+  </p>
+  <pre style="display: none">
 {{ saml_attributes|pprint }}
-</pre>
+  </pre>
 {% endblock %}
diff --git a/tests/templates/base.html b/tests/templates/base.html
index e26490f..a03934b 100644
--- a/tests/templates/base.html
+++ b/tests/templates/base.html
@@ -1,6 +1,6 @@
 <html>
- <body>
-   {% block content %}
-   {% endblock %}
- </body>
+  <body>
+    {% block content %}
+    {% endblock %}
+  </body>
 </html>
diff --git a/tests/templates/theme.html b/tests/templates/theme.html
index 4c48eb6..c87c72f 100644
--- a/tests/templates/theme.html
+++ b/tests/templates/theme.html
@@ -1,8 +1,8 @@
 <html>
- <body>
-   <p>Theme is ok</p>
-   <p>{{ hook }}</p>
-   {% block content %}
-   {% endblock %}
- </body>
+  <body>
+    <p>Theme is ok</p>
+    <p>{{ hook }}</p>
+    {% block content %}
+    {% endblock %}
+  </body>
 </html>