Fix dsc-585 to actually work

This time, remove dup ids (because that's apparently invalid html...) and set both form vals, rather than just one.