[#85041962] Fixes per feedback from AF
Minor cleanup
[#85041962] Set origin from WHSC submission form