Make form inflight disabling configurable
Merge pull request #1162 from njam/issue-1162

Make form inflight disabling configurable