Improved one time login.