diff --git a/CHANGELOG.md b/CHANGELOG.md
index f58fc7e..9e9188a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v5.1.4
+## 11/16/2021
+
+1. [](#bugfix)
+    * Fixed buttons no longer rendered [#537](https://github.com/getgrav/grav-plugin-form/issues/537) 
+
 # v5.1.3
 ## 10/26/2021
 
diff --git a/blueprints.yaml b/blueprints.yaml
index c83032a..d19c603 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Form
 slug: form
 type: plugin
-version: 5.1.3
+version: 5.1.4
 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 5844a4c..cf0fb17 100644
--- a/templates/forms/default/form.html.twig
+++ b/templates/forms/default/form.html.twig
@@ -130,7 +130,7 @@
     {{ override_inner_markup_fields_start|raw }}
     {{ override_inner_markup_fields|raw }}
 
-    {% if form.enabled %}
+    {% if form.isEnabled() ?? true %}
     {% include include_form_field('formname', field_layout, 'hidden') %}
     {% include include_form_field('formtask', field_layout, 'hidden') %}
     {% include include_form_field('uniqueid', field_layout, 'hidden') %}
@@ -143,7 +143,7 @@
   {% block embed_buttons %}
     {{ override_inner_markup_buttons_start|raw }}
 
-    {% if form.enabled %}
+    {% if form.isEnabled() ?? true %}
     {% for button in form.buttons %}
       {% if button.outerclasses is defined %}<div class="{{ button.outerclasses }}">{% endif %}