Improve authentication challenge a bit