diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift
index 41fec6bb..65b13861 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift
@@ -259,6 +259,21 @@ import UIKit
         resignFirstResponder()
     }
     
+    @objc public func updateValidation(_ isValid: Bool) {
+        let previousValidity = self.isValid
+        self.isValid = isValid
+        
+        if previousValidity && !isValid {
+            shouldShowError(true)
+        } else if (!previousValidity && isValid) {
+            shouldShowError(false)
+        }
+    }
+    
+    func shouldShowError(_ showError: Bool) {
+        self.showError = showError
+    }
+    
     //--------------------------------------------------
     // MARK: - MoleculeViewProtocol
     //--------------------------------------------------
@@ -285,6 +300,18 @@ import UIKit
         
         entryFieldContainer.set(with: model, delegateObject, additionalData)
         
+        model.updateUI = { [weak self] in
+            MVMCoreDispatchUtility.performBlock(onMainThread: {
+                guard let self = self else { return }
+                
+                if self.isSelected {
+                    self.updateValidation(model.isValid ?? true)
+                } else if model.isValid ?? true && self.showError {
+                    self.showError = false
+                }
+            })
+        }
+        
         title = model.title
         feedback = model.feedback
         isEnabled = model.enabled
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift
index 1d6e9221..dd2a3c62 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift
@@ -71,12 +71,13 @@ import Foundation
     }
     
     public func setValidity(_ valid: Bool, rule: RulesProtocol) {
-        if let fieldKey = fieldKey,
-            let ruleErrorMessage = rule.errorMessage?[fieldKey] {
+        
+        if let fieldKey = fieldKey, let ruleErrorMessage = rule.errorMessage?[fieldKey] {
             self.errorMessage = ruleErrorMessage
         }
+        
         self.isValid = valid
-
+        updateUI?()
     }
     
     //--------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
index e849fc2f..2daee169 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
@@ -236,27 +236,6 @@ import UIKit
         super.validateText()
     }
     
-    @objc public func updateValidation(_ isValid: Bool) {
-        let previousValidity = self.isValid
-        self.isValid = isValid
-        
-        if previousValidity && !isValid {
-            shouldShowError(true)
-        } else if (!previousValidity && isValid) {
-            shouldShowError(false)
-        }
-    }
-
-    func shouldShowError(_ showError: Bool) {
-        self.showError = showError
-        if showError {
-            observingTextFieldDelegate?.isValid?(textfield: self)
-            entryFieldContainer.originalUI()
-        } else {
-            observingTextFieldDelegate?.isInvalid?(textfield: self)
-        }
-    }
-    
     /// Executes on UITextField.textDidBeginEditingNotification
     @objc override func startEditing() {
         super.startEditing()
@@ -310,6 +289,16 @@ import UIKit
         }
     }
     
+    override func shouldShowError(_ showError: Bool) {
+        super.shouldShowError(showError)
+        
+        if showError {
+            observingTextFieldDelegate?.isValid?(textfield: self)
+        } else {
+            observingTextFieldDelegate?.isInvalid?(textfield: self)
+        }
+    }
+    
     //--------------------------------------------------
     // MARK: - MoleculeViewProtocol
     //--------------------------------------------------
@@ -319,16 +308,6 @@ import UIKit
         
         guard let model = model as? TextEntryFieldModel else { return }
         
-        model.updateUI = { [weak self] in
-            MVMCoreDispatchUtility.performBlock(onMainThread: {
-                guard let self = self else { return }
-                
-                if self.isSelected {
-                    self.updateValidation(model.isValid ?? true)
-                }
-            })
-        }
-        
         self.delegateObject = delegateObject
         FormValidator.setupValidation(for: model, delegate: delegateObject?.formHolderDelegate)
         text = model.text
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
index e08f3843..0556245d 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextViewEntryField.swift
@@ -217,6 +217,10 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
         showError = !isValid
     }
     
+    override func shouldShowError(_ showError: Bool) {
+        super.shouldShowError(showError)
+    }
+    
     //--------------------------------------------------
     // MARK: - MoleculeViewProtocol
     //--------------------------------------------------
diff --git a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsIgnoreCaseModel.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsIgnoreCaseModel.swift
index 0bdd7ca3..5e014cff 100644
--- a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsIgnoreCaseModel.swift
+++ b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsIgnoreCaseModel.swift
@@ -42,6 +42,11 @@ public class RuleEqualsIgnoreCaseModel: RulesProtocol {
             if let fieldValue = formField.formFieldValue() as? String,
                 compareString.caseInsensitiveCompare(fieldValue) == .orderedSame {
                 valid = true
+                for formKey in fields {
+                    guard let formField = fieldMolecules[formKey] else { continue }
+                    (formField as? FormRuleWatcherFieldProtocol)?.setValidity(true, rule: self)
+                }
+                break
             }
             
             (formField as? FormRuleWatcherFieldProtocol)?.setValidity(valid, rule: self)