Fixed form ids and stuff
Merge branch 'email-digest'