Fix "Save & Continue" + Payment Profiles.

Previously, the save & continue button would not be removed when
combined with certain payment profile options.