Little forms

Poorly named branch at this point, but it (a) fixes the conditional fields, (b) moves the code to add the admin email text field to the edit form, and (b) adds one little form.