Add an extra form id check

Closes #3568541

Merge request reports

Loading