Drop "@" from email sender to avoid spam filters

Drop "@" from email sender to avoid spam filters #13830