diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift
index f7886848..dcccddda 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift
@@ -67,7 +67,10 @@ import Foundation
     }
     
     public func setValidity(_ valid: Bool, rule: RulesProtocol) {
-        self.isValid = valid
+        if let fieldKey = fieldKey {
+            self.errorMessage = rule.errorMessage?[fieldKey]
+            self.isValid = valid
+        }        
     }
     
     //--------------------------------------------------
diff --git a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAllValueChangedModel.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAllValueChangedModel.swift
index 1f50bcc7..aa80f5b0 100644
--- a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAllValueChangedModel.swift
+++ b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAllValueChangedModel.swift
@@ -15,6 +15,7 @@ public class RuleAllValueChangedModel: RulesProtocol {
     
     public static var identifier: String = "allValueChanged"
     public var type: String = RuleAllValueChangedModel.identifier
+    public var errorMessage: [String: String]?
     public var fields: [String]
     
     //--------------------------------------------------
diff --git a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAnyRequiredModel.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAnyRequiredModel.swift
index 6ca905bf..7f153e83 100644
--- a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAnyRequiredModel.swift
+++ b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAnyRequiredModel.swift
@@ -17,6 +17,7 @@ public class RuleAnyRequiredModel: RulesProtocol {
     public static var identifier: String = "anyRequired"
     public var type: String = RuleRequiredModel.identifier
     public var fields: [String]
+    public var errorMessage: [String: String]?
     
     //--------------------------------------------------
     // MARK: - Methods
diff --git a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAnyValueChangedModel.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAnyValueChangedModel.swift
index 450fdb2a..07cf451f 100644
--- a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAnyValueChangedModel.swift
+++ b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAnyValueChangedModel.swift
@@ -16,6 +16,7 @@ public class RuleAnyValueChangedModel: RulesProtocol {
     
     public static var identifier: String = "anyValueChanged"
     public var type: String = RuleAnyValueChangedModel.identifier
+    public var errorMessage: [String: String]?
     public var fields: [String]
 
     //--------------------------------------------------
diff --git a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsModel.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsModel.swift
index fb7585f2..9c5c3837 100644
--- a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsModel.swift
+++ b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleEqualsModel.swift
@@ -17,6 +17,7 @@ public class RuleEqualsModel: RulesProtocol {
     public static var identifier: String = "equals"
     public var type: String = RuleEqualsModel.identifier
     public var fields: [String]
+    public var errorMessage: [String: String]?
     
     //--------------------------------------------------
     // MARK: - Validation
@@ -27,23 +28,24 @@ public class RuleEqualsModel: RulesProtocol {
     }
 
     public func validate(_ fieldMolecules: [String: FormFieldProtocol]) -> Bool {
-        var valid = true
-        var compareValue: AnyHashable?
-        
-        for formKey in fields {
-            guard let formField = fieldMolecules[formKey] else { continue }
+       var valid = true
+       var compareValue: AnyHashable?
 
-            if compareValue == nil {
-                compareValue = formField.formFieldValue()
-                continue
-            }
-            
-            if compareValue != formField.formFieldValue() {
-                valid = false
-                break
-            }
-        }
-        
-        return valid
+       for formKey in fields {
+           guard let formField = fieldMolecules[formKey] else { continue }
+
+           if compareValue == nil {
+               compareValue = formField.formFieldValue()
+               continue
+           }
+
+           if compareValue != formField.formFieldValue() {
+               valid = false
+               (formField as? FormRuleWatcherFieldProtocol)?.setValidity(valid, rule: self)
+               break
+           }
+       }
+
+       return valid
     }
 }
diff --git a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleRegexModel.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleRegexModel.swift
index 68eea7e5..5f60a61b 100644
--- a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleRegexModel.swift
+++ b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleRegexModel.swift
@@ -18,6 +18,7 @@ public class RuleRegexModel: RulesProtocol {
     public var type: String = RuleRegexModel.identifier
     public var fields: [String]
     public var regex: String
+    public var errorMessage: [String: String]?
 
     //--------------------------------------------------
     // MARK: - Properties
diff --git a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleRequiredModel.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleRequiredModel.swift
index b34a24df..c9e7d9f7 100644
--- a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleRequiredModel.swift
+++ b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleRequiredModel.swift
@@ -16,6 +16,7 @@ public class RuleRequiredModel: RulesProtocol {
     
     public static var identifier: String = "allRequired"
     public var type: String = RuleRequiredModel.identifier
+    public var errorMessage: [String: String]?
     public var fields: [String]
 
     //--------------------------------------------------
diff --git a/MVMCoreUI/FormUIHelpers/Rules/Rules/RulesProtocol.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RulesProtocol.swift
index 305b4c35..a2906411 100644
--- a/MVMCoreUI/FormUIHelpers/Rules/Rules/RulesProtocol.swift
+++ b/MVMCoreUI/FormUIHelpers/Rules/Rules/RulesProtocol.swift
@@ -16,7 +16,9 @@ public enum RulesCodingKey: String, CodingKey {
 public protocol RulesProtocol: ModelProtocol {
     // The type of rule
     var type: String { get }
-    
+
+    var errorMessage: [String: String]? { get }
+
     // The fields that this rule applies to.
     var fields: [String] { get set }
 
@@ -33,6 +35,10 @@ public extension RulesProtocol {
         get { return Self.identifier }
     }
 
+//    var errorMessage: String? {
+//        return nil
+//    }
+
     static var categoryCodingKey: String {
         return "type"
     }