Buddypress registration form in Membership plugin


I had a previous question open, but I'm not receiving any response on it after the first response, so opening a new one in the hope you'll get to it sooner.

I upgraded from Membership to

I was using Buddypress and X-profile fields in the previous version so I could add First and Surname fields to Registration Form (should be a default if you ask me).

Problem with my Buddypress integration after upgrading. I had the registration and account forms set to use Buddypress forms, by having an edited copy of bp.account.form.php and bp.registration.form.php in my membershipincludes/includes folder.

After upgrading Membership plugin I put these files back into this folder, but now the default Membership registration forms are being used and not my adjusted Buddypress forms.

How do I fix this?