diff --git a/src/app/developer-tools/components/terms-of-use/terms-of-use.component.html b/src/app/developer-tools/components/terms-of-use/terms-of-use.component.html
index 895fab59eb..05f8c2867c 100644
--- a/src/app/developer-tools/components/terms-of-use/terms-of-use.component.html
+++ b/src/app/developer-tools/components/terms-of-use/terms-of-use.component.html
@@ -124,6 +124,7 @@ <h2 class="orc-font-body-large" i18n="@@developerTools.additionalResources">
 
 <p class="checkbox-container">
   <mat-checkbox
+    #firstInput
     class="mat-checkbox orcid-checkbox-baseline"
     [(ngModel)]="checked"
     [disabled]="!emailAlreadyVerified"
diff --git a/src/app/developer-tools/components/terms-of-use/terms-of-use.component.ts b/src/app/developer-tools/components/terms-of-use/terms-of-use.component.ts
index 9a0617b97a..5e49a0c307 100644
--- a/src/app/developer-tools/components/terms-of-use/terms-of-use.component.ts
+++ b/src/app/developer-tools/components/terms-of-use/terms-of-use.component.ts
@@ -1,10 +1,14 @@
 import {
+  ChangeDetectorRef,
   Component,
+  ElementRef,
   EventEmitter,
   OnDestroy,
   OnInit,
   Output,
+  ViewChild,
 } from '@angular/core'
+import { MatCheckbox } from '@angular/material/checkbox'
 import { Subject } from 'rxjs'
 import { takeUntil } from 'rxjs/operators'
 import { PlatformInfoService } from 'src/app/cdk/platform-info'
@@ -23,13 +27,16 @@ import { RecordService } from 'src/app/core/record/record.service'
 export class TermsOfUseComponent implements OnInit, OnDestroy {
   checked
   dirty: boolean
+  @ViewChild('firstInput', { static: false }) firstInput: MatCheckbox
+
   @Output() developerToolsEnable = new EventEmitter<boolean>()
   $destroy = new Subject<boolean>()
   emailAlreadyVerified: boolean
 
   constructor(
     private developerToolsService: DeveloperToolsService,
-    private _record: RecordService
+    private _record: RecordService,
+    private _changeDetectorRef: ChangeDetectorRef
   ) {}
   ngOnDestroy(): void {
     this.$destroy.next(true)
@@ -46,6 +53,8 @@ export class TermsOfUseComponent implements OnInit, OnDestroy {
         )[0]
         if (primaryEmail?.verified) {
           this.emailAlreadyVerified = true
+          this._changeDetectorRef.detectChanges()
+          this.firstInput?.focus()
         }
       })
   }
diff --git a/src/app/developer-tools/pages/developer-tools/developer-tools.component.html b/src/app/developer-tools/pages/developer-tools/developer-tools.component.html
index b6c1322401..1cf04c69b1 100644
--- a/src/app/developer-tools/pages/developer-tools/developer-tools.component.html
+++ b/src/app/developer-tools/pages/developer-tools/developer-tools.component.html
@@ -11,7 +11,6 @@
           Developer tools
         </h1>
         <a
-          #firstInput
           routerLink="/my-orcid"
           i18n="@@developerTools.backToMyRecod"
           cdkFocusInitial
@@ -95,6 +94,7 @@
                 formControlName="displayName"
                 type="text"
                 id="displayName"
+                #firstInput
               />
               <mat-error
                 *ngIf="form.hasError('required', 'displayName')"
diff --git a/src/app/developer-tools/pages/developer-tools/developer-tools.component.ts b/src/app/developer-tools/pages/developer-tools/developer-tools.component.ts
index 16cdaf6a94..9aad6bfb28 100644
--- a/src/app/developer-tools/pages/developer-tools/developer-tools.component.ts
+++ b/src/app/developer-tools/pages/developer-tools/developer-tools.component.ts
@@ -66,7 +66,7 @@ export class DeveloperToolsComponent implements OnInit, OnDestroy {
   baseURL: string
   isMobile: boolean
 
-  @ViewChild('firstInput') firstInput: ElementRef
+  @ViewChild('firstInput', { static: false }) firstInput: ElementRef
 
   constructor(
     private fb: FormBuilder,
@@ -138,10 +138,9 @@ export class DeveloperToolsComponent implements OnInit, OnDestroy {
             ])
           )
         })
+        this._changeDetectorRef.detectChanges()
+        this.firstInput.nativeElement.focus()
       })
-    this._changeDetectorRef.detectChanges()
-
-    this.firstInput.nativeElement.focus()
   }
 
   save() {
diff --git a/src/app/record/components/funding-stack/funding-stack.component.html b/src/app/record/components/funding-stack/funding-stack.component.html
index 647e129227..ce22149cba 100644
--- a/src/app/record/components/funding-stack/funding-stack.component.html
+++ b/src/app/record/components/funding-stack/funding-stack.component.html
@@ -7,7 +7,6 @@
   "
 >
   <!-- A PANEL COMPONENT FOR EACH FUNDING ON THE STACK -->
-
   <app-panel
     panelId="funding-stack"
     [userRecord]="userRecord"
@@ -20,7 +19,7 @@
     [visibility]="fundingStack.defaultFunding.visibility.visibility"
     [isPublicRecord]="isPublicRecord"
     [putCode]="funding.putCode.value"
-    [isUserSource]="funding.userIsSource"
+    [isUserSource]="userIsSource(funding)"
     [hasExternalIds]="hasExternalIds"
     [userVersionPresent]="fundingStack.userVersionPresent"
     [(displayTheStack)]="displayTheStack"
diff --git a/src/app/record/components/funding-stack/funding-stack.component.ts b/src/app/record/components/funding-stack/funding-stack.component.ts
index 11d35ddd98..1cdd25caa5 100644
--- a/src/app/record/components/funding-stack/funding-stack.component.ts
+++ b/src/app/record/components/funding-stack/funding-stack.component.ts
@@ -26,12 +26,6 @@ export class FundingStackComponent implements OnInit {
   set fundingStack(value: FundingGroup) {
     this.hasExternalIds = !!value.externalIdentifiers.length
     this._fundingStack = value
-    this._fundingStack.fundings = this._fundingStack.fundings.map((funding) => {
-      return {
-        ...funding,
-        userIsSource: this.userIsSource(funding),
-      }
-    })
     this.setFundingsInitialStates(value)
   }
   get fundingStack(): FundingGroup {
@@ -54,16 +48,6 @@ export class FundingStackComponent implements OnInit {
   @Input()
   set userInfo(userInfo: UserInfo) {
     this._userInfo = userInfo
-    if (this._fundingStack.fundings) {
-      this._fundingStack.fundings = this._fundingStack.fundings.map(
-        (funding) => {
-          return {
-            ...funding,
-            userIsSource: this.userIsSource(funding),
-          }
-        }
-      )
-    }
   }
   get userInfo(): UserInfo {
     return this._userInfo
diff --git a/src/app/types/record-funding.endpoint.ts b/src/app/types/record-funding.endpoint.ts
index fed681416a..a9703e61f9 100644
--- a/src/app/types/record-funding.endpoint.ts
+++ b/src/app/types/record-funding.endpoint.ts
@@ -54,7 +54,6 @@ export interface Funding extends AssertionBase {
   typeForDisplay?: string
   dateSortString?: MonthDayYearDate
   fullyLoaded?: boolean
-  userIsSource?: boolean
 }
 
 export enum FundingTypes {