Auth enhancements