Properly set userid for SMTP
Merge remote-tracking branch 'chiiph/bug/fix_setting_userid' into develop