FC-2877 join formtool fix