Option to disable automatic decoration in forms

Ref: #2057