Improve the auth story