PR fixup: No internationalization
PR fixup: Add TODO for email configuration