Be safe and ensure that email gets always sent on topic approval, minor bug fixes on #1699