diff --git a/admin.php b/admin.php
index 68a8b93b..e15e19e3 100644
--- a/admin.php
+++ b/admin.php
@@ -119,6 +119,12 @@ class AdminPlugin extends Plugin
             'list'     => [
                 'array' => true
             ],
+            'elements'  => [
+              'input@' => false
+            ],
+            'element'  => [
+              'input@' => false
+            ],
             'file'     => [
                 'array' => true,
                 'media_field' => true,
diff --git a/themes/grav/templates/forms/fields/element/element.html.twig b/themes/grav/templates/forms/fields/element/element.html.twig
index cf840023..b9343b99 100644
--- a/themes/grav/templates/forms/fields/element/element.html.twig
+++ b/themes/grav/templates/forms/fields/element/element.html.twig
@@ -1,7 +1,7 @@
 {% extends "forms/field.html.twig" %}
 
 {% block field %}
-  {% set name = parent_name|field_parent ~ '.' ~ field.name %}
+  {% set name = parent_name|parent_field ~ '.' ~ field.name %}
   {% set fields = prepare_form_fields(field.fields, name) %}
   {% embed 'forms/default/fields.html.twig' with {name: name, fields: fields} %}
     {% set initial_state = field.name|string is not same as (parent_value|string) ? 'display: none;' %}