diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift
index 2071673d..93e7ceb0 100644
--- a/MVMCoreUI/BaseControllers/ViewController.swift
+++ b/MVMCoreUI/BaseControllers/ViewController.swift
@@ -444,17 +444,20 @@ import UIKit
         
         for case let fieldError as [AnyHashable: Any] in fieldErrors ?? [] {
             
-            guard let fieldKey = fieldError["fieldName"] as? String,
+            guard let fieldName = fieldError["fieldName"] as? String,
                   let userError = fieldError["userMessage"] as? String,
-                  let entryFieldModel = formValidator?.fields[fieldKey] as? EntryFieldModel
+                  let entryFieldModel = formValidator?.fields[fieldName] as? EntryFieldModel
             else { continue }
             
             entryFieldModel.dynamicErrorMessage = userError
             entryFieldModel.isValid = false
-            entryFieldModel.text = ""
+            
+            if fieldError["clearText"] as? Bool ?? true {
+                entryFieldModel.text = ""
+            }
             
             DispatchQueue.main.async { [self] in
-                if let view = UIView.findByAccessibility(identifier: fieldKey), let moleculeView = view as? MoleculeViewProtocol {
+                if let view = UIView.findByAccessibility(identifier: fieldName), let moleculeView = view as? MoleculeViewProtocol {
                     moleculeView.set(with: entryFieldModel, delegateObjectIVar, nil)
                 }
             }