diff --git a/resources/views/livewire/custom-field-set-default-values-for-model.blade.php b/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
index 4ed5a2ec48..0a1b39b45d 100644
--- a/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
+++ b/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
@@ -1,5 +1,4 @@
 <span>
-    @dump($errors)
     <div class="form-group{{ $errors->has('custom_fieldset') ? ' has-error' : '' }}">
         <label for="custom_fieldset" class="col-md-3 control-label">
             {{ trans('admin/models/general.fieldset') }}
@@ -24,12 +23,9 @@
         @if ($this->fields)
 
                 @foreach ($this->fields as $field)
-                @if($errors->has($field->db_column_name()))
-                    "poop"
-                @endif
                     <div class="form-group" wire:key="field-{{ $field->id }}">
 
-                        <label class="col-md-3 control-label{{ $errors->has($field->name) ? ' has-error' : '' }}">{{ $field->name }}</label>
+                        <label class="col-md-3 control-label{{ $errors->has($field->db_column_name()) ? ' has-error' : '' }}">{{ $field->name }}</label>
 
                         <div class="col-md-7">
 
@@ -128,10 +124,17 @@
                                         Unknown field element: {{ $field->element }}
                                     </span>
                                 @endif
+                                        <?php
+                                        $errormessage = $errors->first($field->db_column_name());
+                                        if ($errormessage) {
+                                            $errormessage = preg_replace('/ snipeit /', '', $errormessage);
+                                            print('<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> '.$errormessage.'</span>');
+                                        }
+                                        ?>
                         </div>
                     </div>
 
-                @endforeach
+            @endforeach
 
             @endif
 
diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index 8d414f337d..474a8cf29f 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -66,13 +66,13 @@
               <p class="help-block">{{ $field->help_text }}</p>
               @endif
 
-          <?php
-          $errormessage=$errors->first($field->db_column_name());
-          if ($errormessage) {
-              $errormessage=preg_replace('/ snipeit /', '', $errormessage);
-              print('<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> '.$errormessage.'</span>');
-          }
-            ?>
+                  <?php
+                  $errormessage = $errors->first($field->db_column_name());
+                  if ($errormessage) {
+                      $errormessage = preg_replace('/ snipeit /', '', $errormessage);
+                      print('<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> '.$errormessage.'</span>');
+                  }
+                  ?>
       </div>
 
         @if ($field->field_encrypted)