updated account-auth branch