Bug fix, mail setup