diff --git a/templates/admin/login.html b/templates/admin/login.html
index 1f63b2d..111f485 100644
--- a/templates/admin/login.html
+++ b/templates/admin/login.html
@@ -3,7 +3,7 @@
 
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/login.css" %}" />{% endblock %}
 
-{% block bodyclass %}{{ block.super }} login{% endblock %}
+{% block bodyclass %}login{% endblock %}
 
 {% block nav-global %}{% endblock %}
 
@@ -11,37 +11,37 @@
 
 {% block breadcrumbs %}{% endblock %}
 
+{% block container-top %}{% endblock %}
+
 {% block branding %}
 <h1 id="site-name">SIGI</h1>
 {% endblock %}
 
 {% block content %}
-{% if form.errors and not form.non_field_errors %}
+{% if form.errors and not form.non_field_errors and not form.this_is_the_login_form.errors %}
 <p class="errornote">
 {% if form.errors.items|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %}
 </p>
 {% endif %}
 
-{% if form.non_field_errors %}
-{% for error in form.non_field_errors %}
+{% if form.non_field_errors or form.this_is_the_login_form.errors %}
+{% for error in form.non_field_errors|add:form.this_is_the_login_form.errors %}
 <p class="errornote">
     {{ error }}
 </p>
 {% endfor %}
 {% endif %}
 
-{% block container-top %}{% endblock %}
-
-
 <div id="content-main">
 <form action="{{ app_path }}" method="post" id="login-form">{% csrf_token %}
   <div class="form-row">
-    {{ form.username.errors }}
-    {{ form.username.label_tag }} {{ form.username }}
+    {% if not form.this_is_the_login_form.errors %}{{ form.username.errors }}{% endif %}
+    <label for="id_username" class="required">{{ form.username.label }}:</label> {{ form.username }}
   </div>
   <div class="form-row">
-    {{ form.password.errors }}
-    {{ form.password.label_tag }} {{ form.password }}
+    {% if not form.this_is_the_login_form.errors %}{{ form.password.errors }}{% endif %}
+    <label for="id_password" class="required">{% trans 'Password:' %}</label> {{ form.password }}
+    <input type="hidden" name="this_is_the_login_form" value="1" />
     <input type="hidden" name="next" value="{{ next }}" />
   </div>
   {% url 'admin_password_reset' as password_reset_url %}