bb update

Merge pull request #1106 from onepercentclub/feature/fixing-mails