diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html
index 810ca1c81..e63161f93 100644
--- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.html
@@ -46,7 +46,7 @@
 			</a>
 			<div class="dataset-card-actions">
 				<a class="col-auto border-right pointer" [matMenuTriggerFor]="exportMenu"><span class="material-icons icon-align pr-2">open_in_new</span>{{'DATASET-LISTING.ACTIONS.EXPORT' | translate}}</a>
-				<a class="col-auto border-right pointer" (click)="openShareDialog(activity.dmpId, activity.dmp)"><span class="material-icons icon-align pr-2">group_add</span>{{'DATASET-LISTING.ACTIONS.INVITE-COLLABORATORS' | translate}}</a>
+				<a class="col-auto border-right pointer" (click)="openShareDialog(activity.dmpId, activity.dmp)"><span class="material-icons icon-align pr-2">group_add</span>{{'DATASET-LISTING.ACTIONS.INVITE-SHORT' | translate}}</a>
 				<a class="col-auto pointer" [matMenuTriggerFor]="actionsMenu"><span class="material-icons icon-align pl-2">more_horiz</span></a>
 				<!-- <a class="col-auto" [matMenuTriggerFor]="actionsMenu" *ngIf="!publicMode"><span class="material-icons icon-align pl-2">more_horiz</span></a> -->
 			</div>
diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts
index 47a4a464a..39e2e6a13 100644
--- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts
+++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.ts
@@ -209,6 +209,7 @@ export class DraftsComponent extends BaseComponent implements OnInit {
 		const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
 			// height: '250px',
 			// width: '700px',
+			autoFocus: false,
 			restoreFocus: false,
 			data: {
 				dmpId: dmpRowId,
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
index ebb4b805d..87b812582 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
@@ -125,7 +125,7 @@
 				</a>
 				<div class="dataset-card-actions">
 					<a class="col-auto border-right pointer" [matMenuTriggerFor]="exportMenu"><span class="material-icons icon-align pr-2">open_in_new</span>{{'DATASET-LISTING.ACTIONS.EXPORT' | translate}}</a>
-					<a class="col-auto border-right pointer" (click)="openShareDialog(getDmpId(activity), getDmp(activity))"><span class="material-icons icon-align pr-2">group_add</span>{{'DATASET-LISTING.ACTIONS.INVITE-COLLABORATORS' | translate}}</a>
+					<a class="col-auto border-right pointer" (click)="openShareDialog(getDmpId(activity), getDmp(activity))"><span class="material-icons icon-align pr-2">group_add</span>{{'DATASET-LISTING.ACTIONS.INVITE-SHORT' | translate}}</a>
 					<a class="col-auto pointer" [matMenuTriggerFor]="actionsMenu"><span class="material-icons icon-align pl-2">more_horiz</span></a>
 					<!-- <a class="col-auto" [matMenuTriggerFor]="actionsMenu" *ngIf="!publicMode"><span class="material-icons icon-align pl-2">more_horiz</span></a> -->
 				</div>
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts
index 80ae76eef..0d3e952b7 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts
@@ -285,6 +285,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
 		const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
 			// height: '250px',
 			// width: '700px',
+			autoFocus: false,
 			restoreFocus: false,
 			data: {
 				dmpId: rowId,
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html
index 46e5bfc25..ea72150dc 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.html
@@ -49,7 +49,7 @@
 			</a>
 			<div class="dataset-card-actions">
 				<a class="col-auto border-right pointer" [matMenuTriggerFor]="exportMenu"><span class="material-icons icon-align pr-2">open_in_new</span>{{'DATASET-LISTING.ACTIONS.EXPORT' | translate}}</a>
-				<a class="col-auto border-right pointer" *ngIf="isUserOwner(activity)" (click)="openShareDialog(activity.dmpId, activity.dmp)"><span class="material-icons icon-align pr-2">group_add</span>{{'DATASET-LISTING.ACTIONS.INVITE-COLLABORATORS' | translate}}</a>
+				<a class="col-auto border-right pointer" *ngIf="isUserOwner(activity)" (click)="openShareDialog(activity.dmpId, activity.dmp)"><span class="material-icons icon-align pr-2">group_add</span>{{'DATASET-LISTING.ACTIONS.INVITE-SHORT' | translate}}</a>
 				<a *ngIf="this.isAuthenticated()" class="col-auto pointer" [matMenuTriggerFor]="actionsMenu"><span class="material-icons icon-align pl-2">more_horiz</span></a>
 				<!-- <a class="col-auto" [matMenuTriggerFor]="actionsMenu" *ngIf="!publicMode"><span class="material-icons icon-align pl-2">more_horiz</span></a> -->
 			</div>
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts
index c463371e0..6f1f0dbfd 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dataset-activity/recent-edited-dataset-activity.component.ts
@@ -262,6 +262,7 @@ export class RecentEditedDatasetActivityComponent extends BaseComponent implemen
 		const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
 			// height: '250px',
 			// width: '700px',
+			autoFocus: false,
 			restoreFocus: false,
 			data: {
 				dmpId: dmpRowId,
diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts
index e3725dfd8..a5fca49fe 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.ts
@@ -266,6 +266,7 @@ export class RecentEditedDmpActivityComponent extends BaseComponent implements O
 		const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
 			// height: '250px',
 			// width: '700px',
+			autoFocus: false,
 			restoreFocus: false,
 			data: {
 				dmpId: rowId,
diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
index fa47c3acc..e1d2cd4bd 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
+++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
@@ -26,7 +26,7 @@
 	</a>
 	<div class="dataset-card-actions">
 		<a class="col-auto border-right pointer" [matMenuTriggerFor]="exportMenu"><span class="material-icons icon-align pr-2">open_in_new</span>{{'DATASET-LISTING.ACTIONS.EXPORT' | translate}}</a>
-		<a class="col-auto border-right pointer" *ngIf="isUserOwner" (click)="openShareDialog(dataset.dmpId, dataset.dmp)"><span class="material-icons icon-align pr-2">group_add</span>{{'DATASET-LISTING.ACTIONS.INVITE-COLLABORATORS' | translate}}</a>
+		<a class="col-auto border-right pointer" *ngIf="isUserOwner" (click)="openShareDialog(dataset.dmpId, dataset.dmp)"><span class="material-icons icon-align pr-2">group_add</span>{{'DATASET-LISTING.ACTIONS.INVITE-SHORT' | translate}}</a>
 		<a *ngIf="this.isAuthenticated()" class="col-auto pointer" [matMenuTriggerFor]="actionsMenu"><span class="material-icons icon-align pl-2">more_horiz</span></a>
 		<!-- <a class="col-auto" [matMenuTriggerFor]="actionsMenu" *ngIf="!publicMode"><span class="material-icons icon-align pl-2">more_horiz</span></a> -->
 	</div>
diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts
index 1a22d19c8..2b2591501 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.ts
@@ -142,6 +142,7 @@ export class DatasetListingItemComponent extends BaseComponent implements OnInit
 		const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
 			// height: '250px',
 			// width: '700px',
+			autoFocus: false,
 			restoreFocus: false,
 			data: {
 				dmpId: dmpRowId,
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 aa13b8981..fb1b8f869 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
@@ -215,6 +215,7 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
 
 	openShareDialog(rowId: any, rowName: any) {
 		const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
+			autoFocus: false,
 			restoreFocus: false,
 			data: {
 				dmpId: rowId,
diff --git a/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts b/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts
index 9c2ad38e1..a3529f51d 100644
--- a/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/editor/people-tab/people-tab.component.ts
@@ -37,6 +37,7 @@ export class PeopleTabComponent implements OnInit {
 		const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
 			// height: '250px',
 			// width: '700px',
+			autoFocus: false,
 			data: {
 				dmpId: rowId,
 				dmpName: rowName
@@ -86,5 +87,5 @@ export class PeopleTabComponent implements OnInit {
 				}));
 			}
 		});
-	} 
+	}
 }
diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.html b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.html
index 8e600cd36..fb7cc5926 100644
--- a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.html
+++ b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.html
@@ -7,10 +7,8 @@
 			<h1 mat-dialog-title class="title">{{'DMP-LISTING.ACTIONS.INVITE-AUTHORS' | translate}}</h1>
 		</div>
 		<div mat-dialog-content class="row content">
-			<mat-form-field class="col pt-0 pb-2 mb-4 search" appearance="standard">
-				<app-multiple-auto-complete [formControl]="formGroup.get('users')"
-					placeholder="{{'INVITATION-EDITOR.AUTOCOMPLETE-USER-EMAIL' | translate}}"
-					[configuration]="usersAutoCompleteConfiguration">
+			<mat-form-field class="col pt-0 pb-2 mb-4 search">
+				<app-multiple-auto-complete [formControl]="formGroup.get('users')" placeholder="{{'INVITATION-EDITOR.AUTOCOMPLETE-USER-EMAIL' | translate}}" [configuration]="usersAutoCompleteConfiguration">
 				</app-multiple-auto-complete>
 			</mat-form-field>
 			<p class="d-flex m-0 hint">
@@ -20,10 +18,10 @@
 			<div class="col-12 d-flex justify-content-end align-items-center row m-0 pt-1 pb-1">
 				<mat-form-field class="select-role">
 					<mat-select [formControl]="formGroup.get('role')">
-					  <mat-option [value]="roles.Owner">{{enumUtils.toRoleString(roles.Owner)}}</mat-option>
-					  <mat-option [value]="roles.Member">{{enumUtils.toRoleString(roles.Member)}}</mat-option>
+						<mat-option [value]="roles.Owner">{{enumUtils.toRoleString(roles.Owner)}}</mat-option>
+						<mat-option [value]="roles.Member">{{enumUtils.toRoleString(roles.Member)}}</mat-option>
 					</mat-select>
-				  </mat-form-field>
+				</mat-form-field>
 				<button mat-raised-button *ngIf="hasValue()" (click)="send()" type="button" class="invite-btn mt-2">{{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}}</button>
 				<button mat-raised-button *ngIf="!hasValue()" type="button" class="invite-btn-disabled mt-2">{{'DMP-LISTING.ACTIONS.INVITE-SHORT' | translate}}</button>
 			</div>
diff --git a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss
index 9107d3b25..c1fef8cbc 100644
--- a/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss
+++ b/dmp-frontend/src/app/ui/dmp/invitation/dmp-invitation-dialog.component.scss
@@ -22,11 +22,11 @@
 	padding: 0px;
 }
 
-.mat-form-field {
-	background: #fafafa;
-	border: 1px solid #d1d1d1;
-	border-radius: 4px;
-}
+// .mat-form-field {
+// 	background: #fafafa;
+// 	border: 1px solid #d1d1d1;
+// 	border-radius: 4px;
+// }
 
 .hint {
 	font-size: 0.875rem;
@@ -45,18 +45,18 @@
 
 ::ng-deep .search {
 	.mat-form-field-infix {
-		border: none;
-		padding: 14px;
-	}
-	.mat-form-field-underline {
-		display: none;
-	}
-	.mat-form-field-flex {
-		padding: 0em;
-	}
-	.align-arrow-right {
-		display: none;
+		font-size: 1rem;
+		padding: 0.6em 0 1em 0 !important;
 	}
+	// .mat-form-field-underline {
+	// 	display: none;
+	// }
+	// .mat-form-field-flex {
+	// 	padding: 0em;
+	// }
+	// .align-arrow-right {
+	// 	display: none;
+	// }
 }
 
 .select-role {
diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
index 0c7123d8c..a3cc5904b 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts
@@ -347,6 +347,7 @@ export class DmpListingComponent extends BaseComponent implements OnInit, IBread
 
 	openShareDialog(rowId: any, rowName: any) {
 		const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
+			autoFocus: false,
 			data: {
 				dmpId: rowId,
 				dmpName: rowName
diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts
index 46c2d3a0c..d32fdc78a 100644
--- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.ts
@@ -80,6 +80,7 @@ export class DmpListingItemComponent extends BaseComponent implements OnInit {
 		const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
 			// height: '250px',
 			// width: '700px',
+			autoFocus: false,
 			restoreFocus: false,
 			data: {
 				dmpId: rowId,
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 b52007e21..67319e45d 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
@@ -647,6 +647,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
 		const dialogRef = this.dialog.open(DmpInvitationDialogComponent, {
 			// height: '250px',
 			// width: '700px',
+			autoFocus: false,
 			restoreFocus: false,
 			data: {
 				dmpId: rowId,