Locking the BAPI 'BAPI_BUPA_ADDRESS_CHANGE' (error) in order to update email on the adr6 table when using the CRM WEB

Hi,

We are using a BADI 'ADDRESS_UPDATE'  which contain the Bapi "BAPI_BUPA_ADDRESS_CHANGE' in order to update the email information on the BP tcode.

When we use the CRM web program, this save feature goes to this Badi and calls our bapi.

The problem here is when the user clicks the edit button, it locks BUT000 table (confirmed via tcode sm12).  When the user clicks the save button, it goes to the Badi mentioned above and calls the Bapi which returns a 'LOCKING BY USER XXXXX'.    The reason is that it locks the BUT000 table mentioned above.

We have checked if there are open bp screen but nothing is opened except for the CRM web screen.

Is there any way of solving the locking issue so we can update the email information of the BP?

Thanks.