Adapt emails forms to new schemas