diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php
index 6842d2e2b..b8a52c02c 100644
--- a/app/Http/Controllers/Agent/helpdesk/TicketController.php
+++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php
@@ -2537,7 +2537,7 @@ class TicketController extends Controller
                             }
                             $priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', '=', $ticket->priority_id)->first();
                             if ($priority != null) {
-                                $prio = '<button class="btn btn-xs '.$rep.'" style="background-color: '.$priority->priority_color.'">'.ucfirst($priority->priority_desc).'</button>';
+                                $prio = '<button class="btn btn-xs '.$rep.'" style="background-color: '.$priority->priority_color.'; color:#F9F9F9">'.ucfirst($priority->priority_desc).'</button>';
                             } else {
                                 $prio = '';
                             }
diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
index bcab50ae5..4b34db387 100644
--- a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
@@ -200,7 +200,7 @@ if ($thread->title != "") {
                     <?php
                     $priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $tickets->priority_id)->first();
                     ?>
-                    <div class="callout callout-{{$priority->priority_color}}" style = 'background-color:{{$priority->priority_color}}'>
+                    <div class="callout callout-{{$priority->priority_color}}" style = 'background-color:{{$priority->priority_color}}; color:#F9F9F9'>
                         <div class="row">
                             <div class="col-md-3">
                                 <?php
diff --git a/resources/views/themes/default1/agent/helpdesk/user/show.blade.php b/resources/views/themes/default1/agent/helpdesk/user/show.blade.php
index 98e70a37d..718089e37 100644
--- a/resources/views/themes/default1/agent/helpdesk/user/show.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/user/show.blade.php
@@ -612,13 +612,10 @@ class="active"
                                                 $LastResponse = App\User::where('id', '=', $TicketDatarow->user_id)->first();
                                                 if ($LastResponse->role == "user") {
                                                     $rep = "#F39C12";
-                                                    $username = $LastResponse->user_name;
+                                                    $username = $LastResponse->full_name;
                                                 } else {
                                                     $rep = "#000";
-                                                    $username = $LastResponse->first_name . " " . $LastResponse->last_name;
-                                                    if ($LastResponse->first_name == null || $LastResponse->last_name == null) {
-                                                        $username = $LastResponse->user_name;
-                                                    }
+                                                    $username = $LastResponse->full_name;
                                                 }
                                                 $titles = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->get();
                                                 $count = count($titles);