diff --git a/app/templates/element/form/listItem.php b/app/templates/element/form/listItem.php
index 0c6ff4995..6505d3e1d 100644
--- a/app/templates/element/form/listItem.php
+++ b/app/templates/element/form/listItem.php
@@ -38,7 +38,7 @@
 $this->set('vv_field_arguments', $arguments);
 
 // Additional classes calculation
-$classes = match ($arguments['fieldName']) {
+$classes = match ($this->Fieeld->getFieldType($arguments['fieldName'])) {
   'date',
   'datetime',
   'timestamp'     => 'fields-datepicker ',
diff --git a/app/templates/element/form/nameDiv.php b/app/templates/element/form/nameDiv.php
index 9d90cf458..e36e85d1e 100644
--- a/app/templates/element/form/nameDiv.php
+++ b/app/templates/element/form/nameDiv.php
@@ -64,19 +64,20 @@
 ?>
 
 <div class="field-name <?= $classes ?>">
-  <!-- We print the login checkbox along with the Identifier type. As a result, the label is redundant -->
-  <?php if($fieldName != 'login'): ?>
+
   <div class="field-title">
     <!-- Will this work for accessibility? -->
-    <?php if((isset($labelIsTextOnly) && !$labelIsTextOnly)
+    <?php if((isset($vv_field_arguments['labelIsTextOnly']) && !$vv_field_arguments['labelIsTextOnly'])
              && $this->Fieeld->getFieldType($fieldName) !== 'boolean'): ?>
       <?= $this->Form->label($fn, $label) ?>
-    <?php else: ?>
+    <!-- We print the login checkbox along with the Identifier type. -->
+    <!-- As a result, the label is redundant -->
+    <?php elseif($fieldName != 'login'): ?>
       <?= $label ?>
     <?php endif; ?>
     <?php
     // Required Field
-    if($this->Fieeld->isEditable() && in_array($fn, $this->Fieeld->getReqFields(), true)) {
+    if($this->Fieeld->isEditable() && $this->Fieeld->isReqField($fn)) {
       print $this->element('form/requiredSpan');
     }
     ?>
@@ -84,5 +85,4 @@
   <?php if(isset($desc)): ?>
   <div class="field-desc"><?= $desc ?></div>
   <?php endif; // description?>
-  <?php endif; // login?>
 </div>
\ No newline at end of file