Allow avatar field to be null