Improve consistency of authentication.