Comment 5 for bug 1857351

I think I can spend some time working on this (likely taking the approach Bill mentioned in #2). However, it would be helpful for me to have the desired field order for the forms mentioned in this bug.