Company Matching field should only appear once when User Registration is enabled

[mathetos]

User Story

As a GiveWP admin, I want to configure my form to have user registration, and I expect that the Company Matching field would appear only once within the form.

Details

Currently, if you enable User Registration on the form, then the Company Matching field will appear twice in the form. Once before the User Registration box, and once after. See visuals below.

Expected Behavior

I expect it would appear only once.

Steps to Reproduce

1. Enable and configure the DtD addon
2. Configure your form to have User Registration
3. View the form while logged OUT and confirm that the Company Matching field appears twice

Visuals

Acceptance Criteria

• The company matching field appears only once when User Registration is enabled while viewing the form while logged out
• Even if User Registration + Login is enabled, it still only appears once while logged out
• When User registration is NOT enabled, the Company Matching field still appears once while logged out.