diff --git a/apps/authentication/mixins.py b/apps/authentication/mixins.py index a05d3926f..1eb39fee1 100644 --- a/apps/authentication/mixins.py +++ b/apps/authentication/mixins.py @@ -236,12 +236,13 @@ class AuthMixin: ip = self.get_request_ip() request = self.request + self._set_partial_credential_error(user.username, ip, request) + if user.is_expired: self.raise_credential_error(errors.reason_user_expired) elif not user.is_active: self.raise_credential_error(errors.reason_user_inactive) - self._set_partial_credential_error(user.username, ip, request) self._check_is_local_user(user) self._check_is_block(user.username) self._check_login_acl(user, ip)