diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
index 67c4f1e3f..202beeafd 100644
--- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
+++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
@@ -74,11 +74,17 @@
 					<div class="row header">{{'DMP-OVERVIEW.RESEARCHERS' | translate}}</div>
 					<div class="row">
 						<div *ngFor="let researcher of researchers; let last = last">
-							<a href="{{ getOrcidPathForResearcher(researcher.reference) }}" target="blank" class="researcher">
-								<div class="id-btn">&nbsp;</div>
+							<span *ngIf="isOrcid(researcher.reference)">
+								<a href="{{ getOrcidPathForResearcher(researcher.reference) }}" target="blank" class="researcher">
+									<div class="id-btn">&nbsp;</div>
+									<div *ngIf="!last">{{ researcher.name }}, </div>
+									<div *ngIf="last">{{ researcher.name }}</div>
+								</a>
+							</span>
+							<span *ngIf="!isOrcid(researcher.reference)">
 								<div *ngIf="!last">{{ researcher.name }}, </div>
 								<div *ngIf="last">{{ researcher.name }}</div>
-							</a>
+							</span>
 						</div>
 						<span *ngIf="!researchers || researchers.length === 0" class="material-icons">horizontal_rule</span>
 					</div>
diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts
index a1cfa2d47..1c087f0b8 100644
--- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts
@@ -302,6 +302,11 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
 		return this.configurationService.orcidPath;
 	}
 
+	isOrcid(reference: string) {
+		const head = reference.split(':')[0];
+		return head === 'orcid';
+	}
+
 	getOrcidPathForResearcher(reference: string): string {
 		const path = this.getOrcidPath();
 		const userId = reference.split(':')[1];
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
index 2caad1d46..55efa9cd7 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.html
@@ -66,11 +66,17 @@
 					<div class="row header">{{'DMP-OVERVIEW.RESEARCHERS' | translate}}</div>
 					<div class="row">
 						<div *ngFor="let researcher of dmp.researchers; let last = last">
-							<a href="{{ getOrcidPathForResearcher(researcher.reference) }}" target="blank" class="researcher">
-								<div class="id-btn">&nbsp;</div>
+							<span *ngIf="isOrcid(researcher.reference)">
+								<a href="{{ getOrcidPathForResearcher(researcher.reference) }}" target="blank" class="researcher">
+									<div class="id-btn">&nbsp;</div>
+									<div *ngIf="!last">{{ researcher.name }}, </div>
+									<div *ngIf="last">{{ researcher.name }}</div>
+								</a>
+							</span>
+							<span *ngIf="!isOrcid(researcher.reference)">
 								<div *ngIf="!last">{{ researcher.name }}, </div>
 								<div *ngIf="last">{{ researcher.name }}</div>
-							</a>
+							</span>
 						</div>
 						<span *ngIf="!dmp.researchers || dmp.researchers.length === 0" class="material-icons">horizontal_rule</span>
 					</div>
diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
index bdddc38e9..2d457d237 100644
--- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
@@ -751,6 +751,11 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 		return this.configurationService.orcidPath;
 	}
 
+	isOrcid(reference: string) {
+		const head = reference.split(':')[0];
+		return head === 'orcid';
+	}
+
 	getOrcidPathForResearcher(reference: string): string {
 		const path = this.getOrcidPath();
 		const userId = reference.split(':')[1];