Contacts backup with upload

Fixes two annoying problems.