diff --git a/dokumente/templates/standards/standard_detail.html b/dokumente/templates/standards/standard_detail.html
index 6f43da3..38c2d54 100644
--- a/dokumente/templates/standards/standard_detail.html
+++ b/dokumente/templates/standards/standard_detail.html
@@ -297,7 +297,7 @@ document.addEventListener('DOMContentLoaded', function() {
         <div class="comment-item border-bottom pb-2 mb-2">
           <div class="d-flex justify-content-between align-items-start">
             <div class="flex-grow-1">
-              <strong>${comment.user}</strong> 
+              <strong>${comment.user}</strong>
               <small class="text-muted">(${comment.created_at})</small>
               ${comment.updated_at !== comment.created_at ? `<small class="text-muted">(bearbeitet: ${comment.updated_at})</small>` : ''}
               <div class="mt-1">${comment.text}</div>
diff --git a/dokumente/views.py b/dokumente/views.py
index 0b535dd..53e7b49 100644
--- a/dokumente/views.py
+++ b/dokumente/views.py
@@ -271,7 +271,7 @@ def get_vorgabe_comments(request, vorgabe_id):
         comments_data.append({
             'id': comment.id,
             'text': escaped_text,
-            'user': escape(comment.user.username),
+            'user': escape(comment.user.first_name+" "+comment.user.last_name),
             'created_at': comment.created_at.strftime('%d.%m.%Y %H:%M'),
             'updated_at': comment.updated_at.strftime('%d.%m.%Y %H:%M'),
             'is_own': comment.user == request.user