Carrier reset to None when changing party or addresses
When changing party or addresses if we have already a carrier selected which is still in the selection, it is reset to None.
This is wrong, the carrier should only be reset to None if there are no available carriers.