Added remove_avatar option to users...