Heri & Sophie | #2998 | Fixing: multiple emails are sent in a particular case