New Address remove fields for existing customers

[GrandMa90]

Hi everyone!

 

So, the problem is this:

 

 I have the regular registration process for customers, where i have set the required fields in BO (client is B2B, so during the registration the customer must input Company and VAT Number). All works well.

 

However, when a registered customer tries to add a new address, he is prompted AGAIN to input Company and VAT Number. When the tries to input the VAT Number again, error is thrown: The VAT Number is already used or incorrect.

 

Is there a way that when adding a new address for an existing customer, those fields to be set to not required and be rendered invisible?  

 

Thanks for the help!