diff --git a/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html b/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html
index d6176472c..433600d26 100644
--- a/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html
+++ b/src/app/cdk/trusted-summary/component/trusted-summary/trusted-summary.component.html
@@ -144,7 +144,7 @@ <h1 class="orc-font-body-large">
           [activitySection]="'affiliations'"
         ></app-summary-panel>
       </ng-container>
-      <ng-container *ngIf="emailDomains.length >= 1">
+      <ng-container *ngIf="emailDomains?.length >= 1">
         <a
           tabindex="0"
           rel="noopener noreferrer"
diff --git a/src/app/core/observability-events/observability-events.service.ts b/src/app/core/observability-events/observability-events.service.ts
index b9187d088..958da77e4 100644
--- a/src/app/core/observability-events/observability-events.service.ts
+++ b/src/app/core/observability-events/observability-events.service.ts
@@ -59,8 +59,9 @@ export class CustomEventService {
       eventName,
       elapsedTime,
     }
-    ;(this.window as any).newrelic.addPageAction(journeyType, eventAttributes)
-
+    if (typeof (this.window as any)?.addPageAction === 'function') {
+      ;(this.window as any).newrelic.addPageAction(journeyType, eventAttributes)
+    }
     // Send the custom event to New Relic
 
     if (environment.debugger) {
@@ -94,7 +95,9 @@ export class CustomEventService {
     }
 
     // Send the final custom event to New Relic
-    ;(this.window as any).addPageAction(journeyType, finalAttributes)
+    if (typeof (this.window as any)?.addPageAction === 'function') {
+      ;(this.window as any).addPageAction(journeyType, finalAttributes)
+    }
 
     // Clean up the journey data
     delete this.journeys[journeyType]
diff --git a/src/app/register2/components/form-anti-robots/form-anti-robots.component.ts b/src/app/register2/components/form-anti-robots/form-anti-robots.component.ts
index 8e4deb525..7c9a67ad7 100644
--- a/src/app/register2/components/form-anti-robots/form-anti-robots.component.ts
+++ b/src/app/register2/components/form-anti-robots/form-anti-robots.component.ts
@@ -12,6 +12,7 @@ import { merge, Subject } from 'rxjs'
 import { Register2Service } from 'src/app/core/register2/register2.service'
 
 import { BaseForm } from '../BaseForm'
+import { RegisterStateService } from '../../register-state.service'
 
 @Component({
   selector: 'app-form-anti-robots',
@@ -31,11 +32,11 @@ import { BaseForm } from '../BaseForm'
   ],
 })
 export class FormAntiRobotsComponent extends BaseForm implements OnInit {
-  @Input() nextButtonWasClicked
   captchaFailState = false
   captchaLoadedWithWidgetId: number
   $widgetIdUpdated = new Subject()
   errorState = false
+  nextButtonWasClicked = false
   captcha = new UntypedFormControl(null, {
     validators: [this.captchaValidator()],
   })
@@ -43,11 +44,14 @@ export class FormAntiRobotsComponent extends BaseForm implements OnInit {
     this.form = new UntypedFormGroup({
       captcha: this.captcha,
     })
+    this._registerStateService.getNextButtonClickFor('d').subscribe(() => {
+      this.nextButtonWasClicked = true
+    })
   }
 
   constructor(
     private _register: Register2Service,
-    private _errorStateMatcher: ErrorStateMatcher
+    private _registerStateService: RegisterStateService
   ) {
     super()
   }
diff --git a/src/app/register2/components/form-terms/form-terms.component.ts b/src/app/register2/components/form-terms/form-terms.component.ts
index ec3bf671c..4dd9ed513 100644
--- a/src/app/register2/components/form-terms/form-terms.component.ts
+++ b/src/app/register2/components/form-terms/form-terms.component.ts
@@ -11,6 +11,7 @@ import { Register2Service } from 'src/app/core/register2/register2.service'
 import { environment } from 'src/environments/environment'
 
 import { BaseForm } from '../BaseForm'
+import { RegisterStateService } from '../../register-state.service'
 
 @Component({
   selector: 'app-form-terms',
@@ -36,11 +37,12 @@ import { BaseForm } from '../BaseForm'
 })
 // tslint:disable-next-line: class-name
 export class FormTermsComponent extends BaseForm implements OnInit, DoCheck {
-  @Input() nextButtonWasClicked: boolean
+  nextButtonWasClicked: boolean
   environment = environment
   constructor(
     private _register: Register2Service,
-    private _errorStateMatcher: ErrorStateMatcher
+    private _errorStateMatcher: ErrorStateMatcher,
+    private _registerStateService: RegisterStateService
   ) {
     super()
   }
@@ -53,6 +55,9 @@ export class FormTermsComponent extends BaseForm implements OnInit, DoCheck {
       termsOfUse: this.termsOfUse,
       dataProcessed: this.dataProcessed,
     })
+    this._registerStateService.getNextButtonClickFor('d').subscribe(() => {
+      this.nextButtonWasClicked = true
+    })
   }
 
   // OVERWRITE
diff --git a/src/app/register2/components/step-d/step-d.component.html b/src/app/register2/components/step-d/step-d.component.html
index 3c441ffcc..44872cfe5 100644
--- a/src/app/register2/components/step-d/step-d.component.html
+++ b/src/app/register2/components/step-d/step-d.component.html
@@ -40,11 +40,9 @@ <h2 class="orc-font-body-small" i18n="@@register.step5.3">
       ></app-form-notifications>
       <app-form-terms
         formControlName="termsOfUse"
-        [nextButtonWasClicked]="nextButtonWasClicked"
       ></app-form-terms>
       <app-form-anti-robots
         formControlName="captcha"
-        [nextButtonWasClicked]="nextButtonWasClicked"
       ></app-form-anti-robots>
       <div class="step-actions">
         <button
diff --git a/src/app/register2/components/step-d/step-d.component.ts b/src/app/register2/components/step-d/step-d.component.ts
index fc204f948..5263881dd 100644
--- a/src/app/register2/components/step-d/step-d.component.ts
+++ b/src/app/register2/components/step-d/step-d.component.ts
@@ -18,8 +18,6 @@ export class StepDComponent extends BaseStepDirective {
   @Input() loading
   @Input() reactivation: ReactivationLocal
 
-  nextButtonWasClicked = false
-
   constructor(
     private _registrationStateService: RegisterStateService,
     private _registerObservabilityService: RegisterObservabilityService