Improved auth return.