Fix bug #827: Improve invitation emails