diff --git a/CHANGELOG.md b/CHANGELOG.md
index 380c9ee..70a73d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,17 @@
+# v5.1.7
+## 03/14/2022
+
+1. [](#new)
+    * Added `access` support for buttons
+2. [](#bugfix)
+   * Fixed tabs in the frontend to ensure JS is loaded
+   
 # v5.1.6
 ## 02/07/2022
 
 1. [](#bugfix)
-   * Fixed Select field when using OptGroups, not allowing key/values [#541](https://github.com/getgrav/grav-plugin-form/issues/541)
-   * Support for translatable OptGroup labels in Select field [#540](https://github.com/getgrav/grav-plugin-form/issues/540)
+    * Fixed Select field when using OptGroups, not allowing key/values [#541](https://github.com/getgrav/grav-plugin-form/issues/541)
+    * Support for translatable OptGroup labels in Select field [#540](https://github.com/getgrav/grav-plugin-form/issues/540)
 
 # v5.1.5
 ## 01/24/2022
diff --git a/blueprints.yaml b/blueprints.yaml
index 4ba82a4..d0aa2ff 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Form
 slug: form
 type: plugin
-version: 5.1.6
+version: 5.1.7
 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 cf0fb17..57ed7b6 100644
--- a/templates/forms/default/form.html.twig
+++ b/templates/forms/default/form.html.twig
@@ -145,6 +145,7 @@
 
     {% if form.isEnabled() ?? true %}
     {% for button in form.buttons %}
+      {% if not button.access or authorize(button.access) %}
       {% if button.outerclasses is defined %}<div class="{{ button.outerclasses }}">{% endif %}
 
       {% if button.url %}
@@ -190,6 +191,7 @@
       {% endembed %}
 
       {% if button.outerclasses is defined %}</div>{% endif %}
+      {% endif %}
     {% endfor %}
     {% endif %}
 
diff --git a/templates/forms/fields/tabs/tabs.html.twig b/templates/forms/fields/tabs/tabs.html.twig
index 4d24a70..4195d22 100644
--- a/templates/forms/fields/tabs/tabs.html.twig
+++ b/templates/forms/fields/tabs/tabs.html.twig
@@ -1,6 +1,6 @@
 {% extends "forms/field.html.twig" %}
 
-{% if grav.admin is not defined %}
+{% if not grav.admin %}
 {% do assets.addJs('plugin://form/assets/form.vendor.js', { 'group': 'bottom', 'loading': 'defer' }) %}
 {% do assets.addJs('plugin://form/assets/form.min.js', { 'group': 'bottom', 'loading': 'defer' }) %}
 {% endif %}
@@ -29,7 +29,7 @@
         {% endfor %}
     {% else %}
         {% set tabsKey = form.name ~ '-' ~ fields|keys|join(':')|md5 %}
-        {% set storedValue = grav.admin is defined ? get_cookie('grav-tabs-state')|default('{}')|json_decode : [] %}
+        {% set storedValue = grav.admin ? get_cookie('grav-tabs-state')|default('{}')|json_decode : [] %}
         {% set storedTab = attribute(storedValue, 'tab-' ~ tabsKey) %}
         {% if storedTab is empty %}
             {% set active = uri.params.tab ?? field.active ?? 1 %}