Username pulled from Wordpress - PilotPress

PLEASE, PLEASE, PLEASE change the way PilotPress pulls the username from existing customers on our Wordpress sites when we add them as a new member in the OP Contact membership tab. The way it works now, OP is using the contact's email as the username in the OP membership record, but this is NOT matching up with the existing username on their account in Wordpress, so the person is not able to log in and access the membership pages because there is a discrepancy in login credentials.

FIX - continue to match/sync based on email, but change the field that gets pulled for the OP membership username to match the username field in Wordpress, and the same with the password field. This should also be pulled from the Wordpress user field.