diff --git a/goofy-client/libs/navigation/src/lib/header-container/header/header.component.html b/goofy-client/libs/navigation/src/lib/header-container/header/header.component.html
index a4e38dda852e9db83c238de80351353aa07cc4f7..96ee9e5ebac4bc3b3d12d9f4dca52b699ae59a85 100644
--- a/goofy-client/libs/navigation/src/lib/header-container/header/header.component.html
+++ b/goofy-client/libs/navigation/src/lib/header-container/header/header.component.html
@@ -23,7 +23,7 @@
 		<mat-menu #accountMenu="matMenu">
 			<button mat-menu-item (click)="logoutEmitter.emit()" data-test-id="logout-button">
 				<mat-icon>logout</mat-icon>
-				<span>Logout</span>
+				<span>Abmelden</span>
 			</button>
 		</mat-menu>
 	</div>
diff --git a/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.html b/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.html
index 4ce6896bef5d7bb431524c341e616d75ce9f8d55..7fb7327eb73485fc1faf7fb90c83e4a1dd63f809 100644
--- a/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.html
+++ b/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.html
@@ -4,7 +4,10 @@
 </h2>
 <mat-dialog-content>
 	<p data-test-id="error-message">Wir sind nicht ganz sicher, was schiefgelaufen ist. Der Fehler wurde unserem Support gemeldet. Bitte starten sie die Anwendung neu.</p>
-	<goofy-client-button-with-spinner icon="refresh" text="Neu starten" data-test-id="logout-button"
+	<a href="/" tabindex="-1" class="button">
+		<goofy-client-button-with-spinner icon="refresh" text="Neu starten"></goofy-client-button-with-spinner>
+	</a>
+	<goofy-client-button-with-spinner icon="logout" text="Abmelden" data-test-id="logout-button"
 		(clickEmitter)="authService.logOut()">
 	</goofy-client-button-with-spinner>
 </mat-dialog-content>
diff --git a/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.scss b/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.scss
index 61bf80d1cd2fad6410d63e78376daf2fdf1aa206..aaa2d32777c39b6a7bd3dd7a7d8718b514050dd9 100644
--- a/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.scss
+++ b/goofy-client/libs/ui/src/lib/ui/notification/internal-server-error-dialog/internal-server-error-dialog.component.scss
@@ -11,3 +11,7 @@ h2 {
 		height: 30px;
 	}
 }
+
+.button {
+	margin-right: 16px;
+}