Use the auth tokens a bit more nicely