#838 - ensure form target is unique