WIP - [fix bug 962712] Fix missing invitee name.

The email template was also changed to match the suggested content from the bug description.