diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1b1caee..daad0c4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -20,6 +20,7 @@ Fixed
 -----
 * Allow both unicode and bytes dotted string in utils.import_attr
 * Fix some spelling and grammar on log messages. (thanks to Allie Micka)
+* Fix froms css class error on success/error due to a scpaless block
 
 Changed
 -------
diff --git a/cas_server/templates/cas_server/form.html b/cas_server/templates/cas_server/form.html
index 5571a7b..405dedd 100644
--- a/cas_server/templates/cas_server/form.html
+++ b/cas_server/templates/cas_server/form.html
@@ -6,13 +6,13 @@
 </div>
 {% endfor %}
 {% for field in form %}{% if not field|is_hidden %}
-<div class="form-group{% spaceless %}
+<div class="form-group
   {% if not form.non_field_errors %}
     {% if field.errors %} has-error
     {% elif form.cleaned_data %} has-success
     {% endif %}
   {% endif %}"
-{% endspaceless %}>{% spaceless %}
+>{% spaceless %}
   {% if field|is_checkbox %}
     <div class="checkbox"><label for="{{field.auto_id}}">{{field}}{{field.label}}</label></div>
   {% else %}