Fixes for bugs 1817 (Radio group data not being passed), and 1821 (email to user-supplied email address not being validated).