diff --git a/CHANGELOG.md b/CHANGELOG.md
index 401e3fbf..916bf02a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
     * Fixed audit vulnerabilities in module dependencies and house cleanup [#2096](https://github.com/getgrav/grav-plugin-admin/issues/2096)
     * Fixed issue preventing Drag & Drop of media files while in Expert Mode [#1927](https://github.com/getgrav/grav-plugin-admin/issues/1927)
     * Fixed broken link colors in `preset.css` which was causing issues with tabs and dropdowns
+    * Fixed permission check for configuration save [#2130](https://github.com/getgrav/grav-plugin-admin/issues/2130)
 
 # v1.10.12
 ## 04/15/2021
diff --git a/classes/plugin/AdminBaseController.php b/classes/plugin/AdminBaseController.php
index acf54555..d2f2935b 100644
--- a/classes/plugin/AdminBaseController.php
+++ b/classes/plugin/AdminBaseController.php
@@ -528,14 +528,9 @@ class AdminBaseController
         $permissions = ['admin.super'];
 
         switch ($type) {
-            case 'configuration':
             case 'config':
-            case 'system':
-                $permissions[] = 'admin.configuration.system';
-                break;
-            case 'settings':
-            case 'site':
-                $permissions[] = 'admin.configuration.site';
+                $type = $this->route ?: 'system';
+                $permissions[] = 'admin.configuration.' . $type;
                 break;
             case 'plugins':
                 $permissions[] = 'admin.plugins';
diff --git a/themes/grav/templates/config.html.twig b/themes/grav/templates/config.html.twig
index a1a358e7..ffd1bf63 100644
--- a/themes/grav/templates/config.html.twig
+++ b/themes/grav/templates/config.html.twig
@@ -1,9 +1,10 @@
 {% extends 'partials/base.html.twig' %}
 
 {% set configurations = admin.configurations(true) %}
-{% set config_slug = uri.basename %}
-{% if config_slug == 'config' %}
+{% set config_slug = admin.route %}
+{% if not config_slug %}
     {% set config_slug = configurations|first %}
+    {% do admin.redirect('config/' ~ config_slug, 302) %}
 {% endif %}
 {% set isInfo = (config_slug == 'info') %}