diff --git a/shelfzilla/themes/bootflat/templates/users/login.html b/shelfzilla/themes/bootflat/templates/users/login.html
index 4c47c6a..18a3d02 100644
--- a/shelfzilla/themes/bootflat/templates/users/login.html
+++ b/shelfzilla/themes/bootflat/templates/users/login.html
@@ -8,8 +8,10 @@
 {% if login_form.errors %}
 <script type="text/javascript">
 $(function(){
-    {% for key, error in login_form.errors.items %}
-    toastr.error('{{ error }}');
+    {% for field, error in login_form.errors.items %}
+    {% if field == '__all__' %}
+    toastr.error('{{ error|striptags }}');
+    {% endif %}
     {% endfor %}
 })
 </script>
@@ -26,9 +28,12 @@ $(function(){
             {% csrf_token %}
             {% for field in login_form %}
             <div class="form-group {% if field.errors %}has-error has-feedback{% endif %} form-horizontal">
+                {% for error in field.errors %}
+                <p><span class="label label-danger">{{ error|striptags }}</span></p>
+                {% endfor %}
                 <label class="col-sm-2 control-label">{{ field.label }}</label>
-                <div class="col-sm-offset-2 col-sm-8">
-                    <input type="{{ field.type }}" name="{{ field.name }}" class="form-control {{ field.classes }}" />
+                <div class="col-sm-offset-2 col-sm-8 field-{{ field.html_name }}">
+                    <input type="{{ field.field.widget.input_type }}" name="{{ field.html_name }}" class="form-control {{ field.classes }}" />
                     {% if field.errors %}
                     <span class="glyphicon glyphicon-remove form-control-feedback"></span>
                     {% endif %}