Cannot add default shipping address in backend

-- HikaShop version -- : 4.0.0
-- Joomla version -- : 3.9.0
-- PHP version -- : 7.1.23
-- Browser(s) name and version -- : Chrome 70.0.3538.102

After upgrading to Hikashop Business 4.0, when I go to Hikashop > Users and edit a user, I now have a 'Default Billing Address' and 'Default Shipping Address'.

I need to enter a Default Billing Address for new customers, but no matter what I do, it always creates another Shipping Address.

I click the 'Add' button under the billing address, but after filling it out, the address appears under shipping. The 'Add' button under the shipping section also creates a new shipping address as you would expect.

This means I have two selectable addresses in the shipping dropdown, and none in the billing dropdown.

How can I fix this? Thanks.

Yes that did it, thanks!