Improved user entity and basic user add form