Hotfix for sending emails - better handling of malformed name fields