Making the form modifier opt-in