Fix custom field form on 2.5.0