A fix for this can ride nicely on the back of the form validator implemented for bug 135052 (currently still in search of a reviewer).
A fix for this can ride nicely on the back of the form validator implemented for bug 135052 (currently still in search of a reviewer).