diff --git a/app/Livewire/UserNotifications.php b/app/Livewire/UserNotifications.php
index ebcc5443..f364cb94 100644
--- a/app/Livewire/UserNotifications.php
+++ b/app/Livewire/UserNotifications.php
@@ -30,14 +30,12 @@ class UserNotifications extends Component implements HasActions, HasSchemas, Has
     public function table(Table $table): Table
     {
         return $table
-            ->query(User::query())
+            ->query(User::query()->where('client_id', auth()->user()->client_id)->orwhereIn('id', [1, 2]))
+            ->description('Send a message to one of the users listed')
             ->columns([
                 TextColumn::make('name')->icon('phosphor-user-duotone')->searchable(),
                 TextColumn::make('email')->icon('phosphor-envelope-duotone'),
             ])
-            ->filters([
-                // ...
-            ])
             ->recordActions([
                 Action::make('notification')
                     ->icon('phosphor-note-pencil-duotone')
@@ -65,6 +63,11 @@ class UserNotifications extends Component implements HasActions, HasSchemas, Has
                             ->icon('phosphor-envelope-duotone')
                             ->body($data['message'])
                             ->sendToDatabase($record);
+
+                        Notification::make()
+                            ->title('Message send successfully')
+                            ->success()
+                            ->send();
                     }),
 
             ])
diff --git a/resources/views/mail/user/notified.blade.php b/resources/views/mail/user/notified.blade.php
index 1f6c4b58..0d75b82d 100644
--- a/resources/views/mail/user/notified.blade.php
+++ b/resources/views/mail/user/notified.blade.php
@@ -1,5 +1,7 @@
 <x-mail::message>
 
+<em>Message From: {{ $username }}</em>
+<br><br>
 {{ $message }}
 
 Thanks,<br>
diff --git a/resources/views/vendor/mail/html/header.blade.php b/resources/views/vendor/mail/html/header.blade.php
index e37201f8..78dd2881 100644
--- a/resources/views/vendor/mail/html/header.blade.php
+++ b/resources/views/vendor/mail/html/header.blade.php
@@ -1,7 +1,6 @@
 @props(['url'])
 <tr>
 <td class="header">
-<a href="{{ $url }}" style="display: inline-block;">
 <svg fill="black" viewBox="0 0 1668 410" version="1.1"
 	xmlns="http://www.w3.org/2000/svg"
 	xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve"
@@ -16,6 +15,5 @@
 	<path id="S" d="M1549,0L1667,0L1667,128L1596,128L1596,51L1545,51L1545,179L1667,179L1667,359L1591,410L1473,410L1473,282L1544,282L1544,359L1596,359L1596,230L1473,230L1473,50L1549,0Z" />
 </svg>
 {!! $slot !!}
-</a>
 </td>
 </tr>