Issue #2116909 by matty.tee: Fixed Issues with 'Submission form settings".