diff --git a/app/Http/Controllers/API/TicketController.php b/app/Http/Controllers/API/TicketController.php
index 84935df9..8f4f8e9a 100755
--- a/app/Http/Controllers/API/TicketController.php
+++ b/app/Http/Controllers/API/TicketController.php
@@ -38,7 +38,7 @@ public function getTicketMessages(Request $request)
     {
         if(Ticket::find($request->ticket_id))
         {
-            $messages = Message::where('ticket_id', $request->ticket_id)
+            $messages = Message::with('admin')->where('ticket_id', $request->ticket_id)
                 ->orderBy('id', 'asc')
                 ->paginate($request->per_page ?? 10);
 
diff --git a/resources/views/admin/messages.blade.php b/resources/views/admin/messages.blade.php
index 098a34b9..f24b2497 100755
--- a/resources/views/admin/messages.blade.php
+++ b/resources/views/admin/messages.blade.php
@@ -82,8 +82,6 @@
                         </h3>
                         <div class="chat-log__message"><p>{{ $ticket->content }}</p></div>
                     </div>
-                @else
-                    <div class="chat-log__item admin bg-gray-200"><h3 class="chat-log__author">{{backpack_user()->name}} <small class="small-date">{{ $ticket->created_at }}</small></h3><div class="chat-log__message">{{ $ticket->content }}</div></div>
                 @endif
                 <div id="chat-messages">
                 </div>
@@ -111,6 +109,7 @@
             type: 'GET',
             dataType: 'json', // added data type
             success: function(res) {
+                console.log(res);
                 res.data.forEach(element => {
                     var m = new Date(element.created_at);
                     var dateString = m.getUTCDate() + "." + (m.getUTCMonth()+1) + "." + m.getUTCFullYear() + " " + m.getUTCHours() + ":" + m.getUTCMinutes();
@@ -118,7 +117,7 @@
                         $('#chat-messages').append('<div class="chat-log__item client"><h3 class="chat-log__author">{{ $ticket->account->profile->name ?? "user" }} <small class="small-date">' + dateString + '</small></h3><div class="chat-log__message"><p>' + element.content + '</p></div></div>');
                     }
                     else{
-                        $('#chat-messages').append('<div class="chat-log__item admin bg-gray-200"><h3 class="chat-log__author">{{backpack_user()->name}} <small class="small-date">' + dateString + '</small></h3><div class="chat-log__message">' + element.content + '</div></div>');
+                        $('#chat-messages').append('<div class="chat-log__item admin bg-gray-200"><h3 class="chat-log__author">' + element.admin + '<small class="small-date">' + dateString + '</small></h3><div class="chat-log__message">' + element.content + '</div></div>');
                     }
                     $("#chat-log").scrollTop(1000000);
                 });
@@ -140,7 +139,7 @@
                             $('#chat-messages').append('<div class="chat-log__item client"><h3 class="chat-log__author">{{ $ticket->client->firstname ?? null }} {{ $ticket->client->lastname ?? null }}<small class="small-date">' + dateString + '</small></h3><div class="chat-log__message"><p>' + element.content + '</p></div></div>');
                         }
                         else{
-                            $('#chat-messages').append('<div class="chat-log__item admin bg-gray-200"><h3 class="chat-log__author">{{backpack_user()->name}} <small class="small-date">' + dateString + '</small></h3><div class="chat-log__message">' + element.content + '</div></div>');
+                            $('#chat-messages').append('<div class="chat-log__item admin bg-gray-200"><h3 class="chat-log__author">' + element.admin + '<small class="small-date">' + dateString + '</small></h3><div class="chat-log__message">' + element.content + '</div></div>');
                         }
                     });
                     console.log(res);