Auth sucks less?

This feels hacky and awful, but may be sufficient.