Custom fields for financial type 'User Select'

We are building a webform for donors.

Donor can be individual (contact 1) or organization (contact 2).

With the 'User Select' contact on the contribution Webform CiviCRM fields, we can create the contribution in an individual or in an organization contact.

We have different financial types for orgs and individuals. Then we would use a 'User Select' for financial type. The problem is that we have custom fields for financial types, needed to be selected in the form, that are only accessible when a specific financial type is selected, and with 'User Select' aren't configurable.

Maybe if 'User Select' is checked, all custom fields should be configurable?