dont let uses set avatar if none has been set

move this logic else where