Added default avatar check