#786 - added additional check on custom/default email