make forms more paranoid (bug 849895)