diff --git a/src/Chamilo/UserBundle/Repository/UserRepository.php b/src/Chamilo/UserBundle/Repository/UserRepository.php
index 7dbb9931e4..18ccf74e26 100644
--- a/src/Chamilo/UserBundle/Repository/UserRepository.php
+++ b/src/Chamilo/UserBundle/Repository/UserRepository.php
@@ -1261,8 +1261,9 @@ class UserRepository extends EntityRepository
             if ($login) {
                 $lastLogin = $login->getLoginDate();
             }
+        } else {
+            $user->setLastLogin($lastLogin);
         }
-        $user->setLastLogin($lastLogin);
 
         $dateNormalizer = new GetSetMethodNormalizer();
         $dateNormalizer->setCircularReferenceHandler(function ($object) {