1 files changed, 1 insertions, 1 deletions

diff --git a/model/user.go b/model/user.go
index 3e99c6fa4..c7ba6b9cb 100644
--- a/model/user.go
+++ b/model/user.go
@@ -132,7 +132,7 @@ func (u *User) IsValid() *AppError {
 		return InvalidUserError("username", u.Id)
 	}
 
-	if len(u.Email) > USER_EMAIL_MAX_LENGTH || len(u.Email) == 0 {
+	if len(u.Email) > USER_EMAIL_MAX_LENGTH || len(u.Email) == 0 || !IsValidEmail(u.Email) {
 		return InvalidUserError("email", u.Id)
 	}