</fieldset>
{/if}
{if $billingDetailsFields|@count && $paymentProcessor.payment_processor_type neq 'PayPal_Express'}
- {if $profileAddressFields}
+ {if $profileAddressFields && !$ccid}
<input type="checkbox" id="billingcheckbox" value="0">
<label for="billingcheckbox">{ts}My billing address is the same as above{/ts}</label>
{/if}