Improved auth handlers