diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 202d02309a..6ed4ad7a80 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -168,7 +168,12 @@ const routes: Routes = [
 ]
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' })],
+  imports: [
+    RouterModule.forRoot(routes, {
+      relativeLinkResolution: 'legacy',
+      anchorScrolling: 'enabled',
+    }),
+  ],
   exports: [RouterModule],
 })
 export class AppRoutingModule {}
diff --git a/src/app/cdk/panel/panel-source/panel-source.component.html b/src/app/cdk/panel/panel-source/panel-source.component.html
index 63f2b1015c..c5bb2b4263 100644
--- a/src/app/cdk/panel/panel-source/panel-source.component.html
+++ b/src/app/cdk/panel/panel-source/panel-source.component.html
@@ -14,22 +14,14 @@
         <strong i18n="@@shared.source">Source</strong>:
         <ng-container *ngIf="recordOnDisplayIsTheSource !== undefined">
           <ng-container
-            *ngIf="
-              recordOnDisplayIsTheSource ||
-              assertionOriginName ||
-              assertionOriginOrcid
-            "
+            *ngIf="assertionOriginOrcid || (recordOnDisplayIsTheSource && !assertionOriginClientId)"
           >
             <mat-icon [attr.aria-label]="selftAssertedSource"
               ><img src="./assets/vectors/profile-not-verified.svg" />
             </mat-icon>
           </ng-container>
           <ng-container
-            *ngIf="
-              !recordOnDisplayIsTheSource &&
-              !assertionOriginName &&
-              !assertionOriginOrcid
-            "
+            *ngIf="assertionOriginClientId || (!recordOnDisplayIsTheSource && !assertionOriginOrcid)"
           >
             <mat-icon
               [attr.aria-label]="validatedSourceAriaLabel"
diff --git a/src/app/cdk/panel/panel-source/panel-source.component.ts b/src/app/cdk/panel/panel-source/panel-source.component.ts
index 3695cda331..1843bb1f3d 100644
--- a/src/app/cdk/panel/panel-source/panel-source.component.ts
+++ b/src/app/cdk/panel/panel-source/panel-source.component.ts
@@ -37,6 +37,7 @@ export class PanelSourceComponent implements OnInit {
   @Input() sourceName
   @Input() assertionOriginOrcid
   @Input() assertionOriginName
+  @Input() assertionOriginClientId
   @Input() stackLength
   @Input() type:
     | 'employment'
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 05f8c2867c..895fab59eb 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,7 +124,6 @@ <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 5e49a0c307..65ced94f1f 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
@@ -27,7 +27,6 @@ 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>()
@@ -54,7 +53,6 @@ export class TermsOfUseComponent implements OnInit, OnDestroy {
         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 1cf04c69b1..ace05d21e8 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
@@ -94,7 +94,6 @@
                 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 9aad6bfb28..9901b44077 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
@@ -84,6 +84,8 @@ export class DeveloperToolsComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
+    this.setFocusToTheMainDiv()
+
     this._platform
       .get()
       .pipe(takeUntil(this.destroy$))
@@ -138,11 +140,17 @@ export class DeveloperToolsComponent implements OnInit, OnDestroy {
             ])
           )
         })
-        this._changeDetectorRef.detectChanges()
-        this.firstInput.nativeElement.focus()
       })
   }
 
+  private setFocusToTheMainDiv() {
+    this.window.location.href = '/developer-tools' + '#main'
+    setTimeout(() => {
+      this.window.window.scrollTo(0, 0)
+      this.window.history.replaceState({}, this.window.document.title, '/developer-tools')
+    })
+  }
+
   save() {
     this.formWasSummited = true
 
diff --git a/src/app/record/components/affiliation-stack/affiliation-stack.component.html b/src/app/record/components/affiliation-stack/affiliation-stack.component.html
index 31fec131e8..3a2dd3a208 100644
--- a/src/app/record/components/affiliation-stack/affiliation-stack.component.html
+++ b/src/app/record/components/affiliation-stack/affiliation-stack.component.html
@@ -74,6 +74,7 @@ <h4 header class="affiliation-title orc-font-body">
       [sourceName]="affiliation.sourceName || affiliation.source"
       [assertionOriginName]="affiliation.assertionOriginName"
       [assertionOriginOrcid]="affiliation.assertionOriginOrcid"
+      [assertionOriginClientId]="affiliation.assertionOriginClientId"
       [stackLength]="affiliationStack.affiliations.length"
       [(displayTheStack)]="displayTheStack"
       (makePrimary)="makePrimaryCard(affiliation)"
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 ce22149cba..4fe3b4683d 100644
--- a/src/app/record/components/funding-stack/funding-stack.component.html
+++ b/src/app/record/components/funding-stack/funding-stack.component.html
@@ -45,6 +45,7 @@ <h4 header class="funding-title orc-font-body">
       [isPreferred]="isPreferred(funding)"
       [sourceName]="funding.sourceName || funding.source"
       [assertionOriginName]="funding.assertionOriginName"
+      [assertionOriginClientId]="funding.assertionOriginClientId"
       [assertionOriginOrcid]="funding.assertionOriginOrcid"
       [stackLength]="fundingStack.fundings.length"
       [(displayTheStack)]="displayTheStack"
diff --git a/src/app/record/components/peer-review-stack/peer-review-stack.component.html b/src/app/record/components/peer-review-stack/peer-review-stack.component.html
index 1958268db6..b35e12ef50 100644
--- a/src/app/record/components/peer-review-stack/peer-review-stack.component.html
+++ b/src/app/record/components/peer-review-stack/peer-review-stack.component.html
@@ -117,6 +117,7 @@
       [isPreferred]="isPreferred(subPeerReview)"
       [sourceName]="subPeerReview.sourceName || subPeerReview.source"
       [assertionOriginName]="subPeerReview.assertionOriginName"
+      [assertionOriginClientId]="subPeerReview.assertionOriginClientId"
       [assertionOriginOrcid]="subPeerReview.assertionOriginOrcid"
       [stackLength]="peerReviewStack.peerReviews.length"
       [(displayTheStack)]="displayTheStack"
diff --git a/src/app/record/components/research-resource-stack/research-resource-stack.component.html b/src/app/record/components/research-resource-stack/research-resource-stack.component.html
index d6bbf04953..124f1ffaaa 100644
--- a/src/app/record/components/research-resource-stack/research-resource-stack.component.html
+++ b/src/app/record/components/research-resource-stack/research-resource-stack.component.html
@@ -44,6 +44,7 @@ <h4 header class="research-resources-title">
       [sourceName]="research.sourceName || research.source"
       [assertionOriginName]="research.assertionOriginName"
       [assertionOriginOrcid]="research.assertionOriginOrcid"
+      [assertionOriginClientId]="research.assertionOriginClientId"
       [stackLength]="researchResourceStack.researchResources.length"
       [(displayTheStack)]="displayTheStack"
       (makePrimary)="makePrimaryCard(research)"
diff --git a/src/app/record/components/work-stack/work-stack.component.html b/src/app/record/components/work-stack/work-stack.component.html
index 104e15caec..5fa528e875 100644
--- a/src/app/record/components/work-stack/work-stack.component.html
+++ b/src/app/record/components/work-stack/work-stack.component.html
@@ -54,6 +54,7 @@ <h4 header class="work-title orc-font-body">{{ work.title.value }}</h4>
       [isPreferred]="isPreferred(work)"
       [sourceName]="work.sourceName || work.source"
       [assertionOriginName]="work.assertionOriginName"
+      [assertionOriginClientId]="work.assertionOriginClientId"
       [assertionOriginOrcid]="work.assertionOriginOrcid"
       [stackLength]="workStack.works.length"
       [(displayTheStack)]="displayTheStack"