Render the correct tag in the admin form
A bit of code cleanup
Add a field to insert into the email