Added a bug for welcome emails support.