diff --git a/app/formtools/templates/formtools/formfield.html b/app/formtools/templates/formtools/formfield.html
index 7da5256..165913f 100644
--- a/app/formtools/templates/formtools/formfield.html
+++ b/app/formtools/templates/formtools/formfield.html
@@ -1,16 +1,11 @@
 {% load add_class %}
 
-<div class="clearfix{% if field.errors %}error{% endif %}">
+<div class="clearfix{% if field.errors %} error{% endif %}">
   {{ field.label_tag }}
   <div class="input">
-    {% if field.errors %}
-      {% if class %}{{ field|add_class:class|add_class:"error" }}{% else %}{{ field|add_class:"error" }}{% endif %}
-    {% else %}
-      {% if class %}{{ field|add_class:class }}{% else %}{{ field}}{% endif %}
-    {% endif %}
-    {% if field.help_text %}
-    <span class="help-block">{{ field.help_text }}</span>
-    {% endif %}
+    {% if class %}{{ field|add_class:class }}{% else %}{{ field}}{% endif %}
+    {% if field.help_text %}<span class="help-block">{{ field.help_text }}</span>{% endif %}
+    {% if field.errors %}<span class="help-inline">{% for error in field.errors %}{{ error }} {% endfor %}</span>{% endif %}
   </div>
 </div>