diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1980001..cf906b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@ There's a change in flash messages handling, please see #391
 - Fix: check user before accessing 2FA code
 - Enh: added `AdminController` REST controller (MatteoF96)
 - Enh: added method `setUser` for LoginForm model (liviuk2)
+- Enh: user model emailTrim validator only if not empty #486 (liviuk2)
 
 ## 1.5.1 April 5, 2020
 
diff --git a/src/User/Model/User.php b/src/User/Model/User.php
index 8bf0842..1e60d71 100644
--- a/src/User/Model/User.php
+++ b/src/User/Model/User.php
@@ -250,7 +250,7 @@ class User extends ActiveRecord implements IdentityInterface
                 'unique',
                 'message' => Yii::t('usuario', 'This email address has already been taken'),
             ],
-            'emailTrim' => ['email', 'trim'],
+            'emailTrim' => ['email', 'trim', 'skipOnEmpty' => true],
 
             // password rules
             'passwordTrim' => ['password', 'trim'],