Fix issue where the basic partners' secret values are being used even if they are set to NULL