Fix up contact sending / template