Enhance registration mail & comment