Better handling of the contact badge