Improved auth form