diff --git a/apps/users/models/user.py b/apps/users/models/user.py
index 23587b1f1..a6cdf9f0e 100644
--- a/apps/users/models/user.py
+++ b/apps/users/models/user.py
@@ -111,7 +111,7 @@ class AuthMixin:
 
     @property
     def password_will_expired(self):
-        if self.is_local and self.password_expired_remain_days < 5:
+        if self.is_local and 0 <= self.password_expired_remain_days < 5:
             return True
         return False
 
diff --git a/apps/users/tasks.py b/apps/users/tasks.py
index ca8ea73da..ab025cae3 100644
--- a/apps/users/tasks.py
+++ b/apps/users/tasks.py
@@ -20,13 +20,13 @@ logger = get_logger(__file__)
 def check_password_expired():
     users = User.objects.exclude(role=User.ROLE_APP)
     for user in users:
+        if not user.is_valid:
+            continue
         if not user.password_will_expired:
             continue
-
         send_password_expiration_reminder_mail(user)
-        logger.info("The user {} password expires in {} days".format(
-            user, user.password_expired_remain_days)
-        )
+        msg = "The user {} password expires in {} days"
+        logger.info(msg.format(user, user.password_expired_remain_days))
 
 
 @shared_task