added token and mail fields to user