fixed the problem that disabled user can login
Merge branch 'm2-dev' of https://github.com/Zjazure/FailureTroubleshooting.git