Added company and AccountType to the User object