Fix on/off if there is no 'off' field.
Fix avatars being reset on vcard request.
Move along, people. Nothing to see here.