diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
index 7973d652..89e17169 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
@@ -247,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()
     }