Allow using username
and email
in SMTP configuration
#3398
Merged
username
and email
in SMTP configuration
#3398