diff --git a/src/components/Post.js b/src/components/Post.js
index f60880e..d7c6692 100644
--- a/src/components/Post.js
+++ b/src/components/Post.js
@@ -8,6 +8,7 @@ import {
     faAngleDown
 } from '@fortawesome/free-solid-svg-icons';
 import {postApi} from "../api/posts.api";
+import keycloak from "../Authentification/Keycloak";
 
 const Post = ({ post, recursionDepth, selectPost, reload }) => {
 
@@ -43,12 +44,9 @@ const Post = ({ post, recursionDepth, selectPost, reload }) => {
         <div>
             <div className="post" onClick={click => {if (!(click.target instanceof HTMLButtonElement)) setShowComments(!showComments)}}>
                 <div className="post-container">
-                    {post.id === post.parent && <div className="post-title">
-                        <h3>{post.title}<span style={{color: 'gray'}}> von {post.anonymousID}</span></h3>
-                    </div>}
-                    {post.id !== post.parent && <div className="post-title">
-                        <h3>Kommentar<span style={{color: 'gray'}}> von {post.anonymousID}</span></h3>
-                    </div>}
+                    <div className="post-title">
+                        <h3>{post.id === post.parent ? post.title : "Kommentar"}<span style={{color: 'gray'}}> von {post.anonymousID === 0 ? keycloak.idTokenParsed.preferred_username : "Anonymous " + post.anonymousID}</span></h3>
+                    </div>
                     <div className="post-content">
                         <p>{post.content}</p>
                     </div>