diff --git a/zero/Validation/Validators/EmailValidator.cs b/zero/Validation/Validators/EmailValidator.cs
index 17627cd7..c2aab460 100644
--- a/zero/Validation/Validators/EmailValidator.cs
+++ b/zero/Validation/Validators/EmailValidator.cs
@@ -18,9 +18,9 @@ public class EmailValidator<T> : PropertyValidator<T, string>, IEmailValidator
 
   public static bool ValidateEmail(string value)
   {
-    if (value == null)
+    if (value.IsNullOrWhiteSpace())
     {
-      return false;
+      return true;
     }
 
     int index = value.IndexOf(KLAMMERAFFE);