Contact form improvements
EDD specific