diff --git a/src/app/donation-start/donation-start-form/donation-start-form.component.html b/src/app/donation-start/donation-start-form/donation-start-form.component.html
index a77cc99cc..9bdedacdb 100644
--- a/src/app/donation-start/donation-start-form/donation-start-form.component.html
+++ b/src/app/donation-start/donation-start-form/donation-start-form.component.html
@@ -402,7 +402,8 @@ <h3 class="b-rt-0 b-m-0 b-bold"><span class="span-hr"></span>How does Big Give u
                   </biggive-text-input>
                   @if (!donor) {
                     <div class="error" aria-live="polite">
-                      <p>Payment fields require the "captcha" puzzle to be solved before we can show them safely.</p>
+                      <p>Sorry, there was an error showing the payment field. Please try again or
+                      <a href="https://biggive.org/contact-form/">contact us</a> if the problem persists.</p>
                     </div>
                   }
                   <div>
diff --git a/src/app/donation-start/donation-start-form/donation-start-form.component.ts b/src/app/donation-start/donation-start-form/donation-start-form.component.ts
index cf05596dc..fdec3e892 100644
--- a/src/app/donation-start/donation-start-form/donation-start-form.component.ts
+++ b/src/app/donation-start/donation-start-form/donation-start-form.component.ts
@@ -584,11 +584,13 @@ export class DonationStartFormComponent implements AfterContentChecked, AfterCon
     const stepperHeaders = stepper.getElementsByClassName('mat-step-header');
     for (const stepperHeader of stepperHeaders) {
       stepperHeader.addEventListener('click', (clickEvent: any) => {
-        if (clickEvent.target.index > 0) {
+        if (this.stepper.selectedIndex > 0) {
           this.progressToNonAmountsStep(); // Handles amount error if needed, like Continue button does.
           return;
         }
 
+        // usages of clickEvent.target may be wrong - wouldn't type check if we typed clickEvent as PointerEvent
+        // instead of Any. But not changing right now as could create regression and doesn't relate to any known bug.
         if (clickEvent.target.innerText.includes('Your details') && this.stepper.selected?.label === 'Gift Aid') {
           this.triedToLeaveGiftAid = true;
         }