Fix: narrow scope of checking if editing v2 forms

Fix: narrow scope of checking if editing v2 forms #5618