diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
index dfe1256a..89e17169 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
@@ -50,7 +50,6 @@ import UIKit
     //--------------------------------------------------
     
     private var observingForChange: Bool = false
-    private let emailTag = 3
     
     /// Validate when user resigns editing. Default: true
     public var validateWhenDoneEditing: Bool = true
@@ -230,12 +229,7 @@ import UIKit
     
     /// Validates the text of the entry field.
     @objc public override func validateText() {
-        var value = textField.text
-        if (textField.tag == emailTag) {
-            // remove spaces (either user entered Or auto-correct suggestion) for the email field
-            value = value?.replacingOccurrences(of: " ", with: "")
-        }
-        text = value
+        text = textField.text
         super.validateText()
     }
     
@@ -253,6 +247,10 @@ import UIKit
     /// Executes on UITextField.textDidChangeNotification (each character entry)
     @objc override func valueChanged() {
         super.valueChanged()
+        if (textEntryFieldModel?.type == .email) {
+            // remove spaces (either user entered Or auto-correct suggestion) for the email field
+            textField.text = textField.text?.replacingOccurrences(of: " ", with: "")
+        }
         validateText()
     }
     
@@ -353,7 +351,6 @@ import UIKit
             
         case .email:
             textField.keyboardType = .emailAddress
-            textField.tag = emailTag
             
         case .phone:
             textField.keyboardType = .phonePad