Fix form block add/edit, make required persist.