Comment 8 for bug 1890629

Removing the signoff and adding needsdiscussion due to the comments.

IMO, I think the whole form behavior could be improved by overhauling it and making it self-aware of which org unit is selected from the main dropdown, but that's a much bigger project.

I'd lean towards moving forward with this patch for now because it appears to be an improvement for some situations even though it doesn't fix all situations. However, I don't have a really strong feeling one way or the other.