Lots of user auth cleanup
Merged