Fix make_form_field prop None bug