diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba872f74..a42217ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v2.3.1
+## 03/23/2017
+
+1. [](#bugfix)
+    * Only include `outerclasses` DIV if defined [#135](https://github.com/getgrav/grav-plugin-form/issues/135)
+
 # v2.3.0
 ## 03/17/2017
 
diff --git a/blueprints.yaml b/blueprints.yaml
index 72cb4741..fb247b6f 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Form
-version: 2.3.0
+version: 2.3.1
 description: Enables the forms handling
 icon: check-square
 author:
diff --git a/templates/forms/default/form.html.twig b/templates/forms/default/form.html.twig
index 8e6dd09a..00068f1d 100644
--- a/templates/forms/default/form.html.twig
+++ b/templates/forms/default/form.html.twig
@@ -49,7 +49,7 @@
   {% endblock %}
 
   {% for button in form.buttons %}
-      <div class="{% if button.outerclasses is defined %} {{ button.outerclasses }}{% endif %}">
+      {% if button.outerclasses is defined %}<div class="{{ button.outerclasses }}">{% endif %}
           {% if button.url %}
               <a href="{{ button.url starts with 'http' ? button.url : url(button.url) }}">
           {% endif %}
@@ -66,7 +66,7 @@
           {% if button.url %}
               </a>
           {% endif %}
-      </div>
+      {% if button.outerclasses is defined %}</div>{% endif %}
   {% endfor %}
 
   {% block inner_markup_buttons_end %}