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 f18cca003b..52c12be0c9 100644
--- a/src/app/cdk/panel/panel-source/panel-source.component.html
+++ b/src/app/cdk/panel/panel-source/panel-source.component.html
@@ -26,11 +26,13 @@
             >
           </ng-container></ng-container
         >
-        <ng-container *ngIf="assertionOriginName || assertionOriginOrcid">
-          {{ assertionOriginName || assertionOriginOrcid }}
-          <i i18n="@@shared.onBehalfOf">via</i>
-        </ng-container>
-        {{ sourceName }}
+        <div>
+          <ng-container *ngIf="assertionOriginName || assertionOriginOrcid">
+            {{ assertionOriginName || assertionOriginOrcid }}
+            <i i18n="@@shared.onBehalfOf">via</i>
+          </ng-container>
+          {{ sourceName }}
+        </div>
       </div>
       <!-- OTHER SOURCES (COLLAPSED PANEL) URL -->
       <ng-container *ngIf="!topPanelOfTheStackMode && clickableSource">
diff --git a/src/app/core/title-service/title.service.ts b/src/app/core/title-service/title.service.ts
index 217f4a55c4..fa4da8571c 100644
--- a/src/app/core/title-service/title.service.ts
+++ b/src/app/core/title-service/title.service.ts
@@ -1,7 +1,6 @@
 import { Injectable, OnInit } from '@angular/core'
 import { Title } from '@angular/platform-browser'
 import { NavigationEnd, NavigationStart, Router } from '@angular/router'
-import { log } from 'console'
 import { ReplaySubject, combineLatest } from 'rxjs'
 import { filter, map, withLatestFrom } from 'rxjs/operators'
 import {
diff --git a/src/app/record/components/affiliation-stack/affiliation-stack.component.ts b/src/app/record/components/affiliation-stack/affiliation-stack.component.ts
index 1530155c0b..ecae63c149 100644
--- a/src/app/record/components/affiliation-stack/affiliation-stack.component.ts
+++ b/src/app/record/components/affiliation-stack/affiliation-stack.component.ts
@@ -56,8 +56,23 @@ export class AffiliationStackComponent implements OnInit {
   get displayTheStack(): boolean {
     return this._displayTheStack
   }
+  private _userInfo: UserInfo
+
+  @Input()
+  public set userInfo(value: UserInfo) {
+    this._userInfo = value
+    this._affiliationStack.affiliations =
+      this._affiliationStack.affiliations.map((affiliation) => {
+        return {
+          ...affiliation,
+          userIsSource: this.userIsSource(affiliation),
+        }
+      })
+  }
+  public get userInfo(): UserInfo {
+    return this._userInfo
+  }
 
-  @Input() userInfo: UserInfo
   @Input() professionalActivitiesTogglz = false
 
   orgDisambiguated: { [key: string]: OrgDisambiguated | null } = {}
diff --git a/src/app/record/components/peer-review-stack/peer-review-stack.component.ts b/src/app/record/components/peer-review-stack/peer-review-stack.component.ts
index aae6e4cf0b..6a11500d0a 100644
--- a/src/app/record/components/peer-review-stack/peer-review-stack.component.ts
+++ b/src/app/record/components/peer-review-stack/peer-review-stack.component.ts
@@ -15,7 +15,6 @@ import { first } from 'rxjs/operators'
 import { RecordPeerReviewService } from '../../../core/record-peer-review/record-peer-review.service'
 import { PlatformInfo, PlatformInfoService } from '../../../cdk/platform-info'
 import { UserRecord } from 'src/app/types/record.local'
-import { log } from 'console'
 
 @Component({
   selector: 'app-peer-review-stack',