Membership 2 conflict with Set Password plugin

When Set Password is active, there are extra password fields on the Membership registration page.

I’ve hidden them via CSS, but I need a better solution, as I would like to avoid clients having to use CSS where possible.