smtp and secret key fixed
Merge branch 'hotfix/smtp'