diff --git a/src/Template/Element/form.ctp b/src/Template/Element/form.ctp
index aaa731c6..db9413f1 100644
--- a/src/Template/Element/form.ctp
+++ b/src/Template/Element/form.ctp
@@ -18,7 +18,7 @@ if ($this->exists('form.before_create')) {
                 <?php if ($formTabGroups) : ?>
                     <?= $this->element('form/tabs') ?>
                 <?php else : ?>
-                    <?= $this->Form->inputs($fields, ['legend' => false]) ?>
+                    <?= $this->Form->controls($fields, ['legend' => false]) ?>
                 <?php endif ?>
             </div>
 
diff --git a/src/Template/Element/form/tabs.ctp b/src/Template/Element/form/tabs.ctp
index 44cef242..b22706ba 100644
--- a/src/Template/Element/form/tabs.ctp
+++ b/src/Template/Element/form/tabs.ctp
@@ -17,7 +17,7 @@ use Cake\Utility\Text;
                 role="tabpanel"
                 class="tab-pane <?= $group === $firstTab ? 'active' : '' ?>"
             >
-                <?= $this->Form->inputs(
+                <?= $this->Form->controls(
                     array_intersect_key($fields, array_flip($groupFields)),
                     ['legend' => false]
                 ) ?>