Issue #8332 by cableman: Fixed contact form with new options as requested