diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift
index 65b13861..3efae2ac 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryField.swift
@@ -325,6 +325,8 @@ import UIKit
             model.wasInitiallySelected = true
             self.isSelected = true
         }
+        
+        showError = model.isValid!
     }
     
     open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
diff --git a/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift b/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift
index e23d2ccd..d5fa9100 100644
--- a/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift
+++ b/MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift
@@ -167,9 +167,11 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
             else { continue }
             
             entryFieldModel.errorMessage = userError
+            entryFieldModel.isValid = true
+            entryFieldModel.text = ""
             
-            DispatchQueue.main.async {
-                let c = self.tableView.cellForRow(at: IndexPath(row: 0, section: 0))?.layoutSubviews()
+            DispatchQueue.main.async { [self] in
+                tableView.reloadData()
             }
         }
     }