Improved auth location