diff --git a/core/src/main/java/org/openedx/core/Validator.kt b/core/src/main/java/org/openedx/core/Validator.kt
index 2f1d143e4..cb3a66ae6 100644
--- a/core/src/main/java/org/openedx/core/Validator.kt
+++ b/core/src/main/java/org/openedx/core/Validator.kt
@@ -4,14 +4,14 @@ import java.util.regex.Pattern
 
 class Validator {
 
-    fun isEmailOrUserNameValid(email: String): Boolean {
-        return if (email.contains("@")) {
+    fun isEmailOrUserNameValid(input: String): Boolean {
+        return if (input.contains("@")) {
             val validEmailAddressRegex = Pattern.compile(
                 "^[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,6}$", Pattern.CASE_INSENSITIVE
             )
-            validEmailAddressRegex.matcher(email).find()
+            validEmailAddressRegex.matcher(input).find()
         } else {
-            email.isBlank().not()
+            input.isNotBlank() && input.contains(" ").not()
         }
     }