some more rearranging
renamed SMTP auth parameter