diff --git a/app/Console/Commands/SetupDummyAccount.php b/app/Console/Commands/SetupDummyAccount.php
index 7eb554775..13c83e0f8 100644
--- a/app/Console/Commands/SetupDummyAccount.php
+++ b/app/Console/Commands/SetupDummyAccount.php
@@ -19,7 +19,8 @@ use Illuminate\Console\Command;
 class SetupDummyAccount extends Command
 {
     protected ?\Faker\Generator $faker;
-    protected User $user;
+    protected User $firstUser;
+    protected User $secondUser;
 
     /**
      * The name and signature of the console command.
@@ -54,7 +55,7 @@ class SetupDummyAccount extends Command
     {
         $this->start();
         $this->wipeAndMigrateDB();
-        $this->createFirstUser();
+        $this->createFirstUsers();
         $this->createVaults();
         $this->createContacts();
         $this->createNotes();
@@ -91,8 +92,12 @@ class SetupDummyAccount extends Command
         $this->line('-----------------------------');
         $this->info('| You can now sign in with one of these two accounts:');
         $this->line('| An account with a lot of data:');
+        $this->line('| First user >>>>>>>>>>>>>>>>>:');
         $this->line('| username: admin@admin.com');
         $this->line('| password: admin123');
+        $this->line('| Second user >>>>>>>>>>>>>>>>>:');
+        $this->line('| username: regis@regis.com');
+        $this->line('| password: admin123');
         $this->line('|------------------------–––-');
         $this->line('|A blank account:');
         $this->line('| username: blank@blank.com');
@@ -104,20 +109,32 @@ class SetupDummyAccount extends Command
         $this->info('Setup is done. Have fun.');
     }
 
-    private function createFirstUser(): void
+    private function createFirstUsers(): void
     {
         $this->info('☐ Create first user of the account');
 
-        $this->user = (new CreateAccount)->execute([
+        $this->firstUser = (new CreateAccount)->execute([
             'email' => 'admin@admin.com',
             'password' => 'admin123',
             'first_name' => 'Michael',
             'last_name' => 'Scott',
         ]);
+        $this->firstUser->email_verified_at = Carbon::now();
+        $this->firstUser->save();
 
-        $this->user = User::first();
-        $this->user->email_verified_at = Carbon::now();
-        $this->user->save();
+        sleep(5);
+
+        $this->info('☐ Create second user of the account');
+
+        $this->secondUser = (new CreateAccount)->execute([
+            'email' => 'regis@regis.com',
+            'password' => 'admin123',
+            'first_name' => 'Dwight',
+            'last_name' => 'Schrutt',
+        ]);
+        $this->secondUser->account_id = $this->firstUser->account_id;
+        $this->secondUser->email_verified_at = Carbon::now();
+        $this->secondUser->save();
 
         sleep(5);
     }
@@ -128,8 +145,8 @@ class SetupDummyAccount extends Command
 
         for ($i = 0; $i < rand(3, 5); $i++) {
             (new CreateVault)->execute([
-                'account_id' => $this->user->account_id,
-                'author_id' => $this->user->id,
+                'account_id' => $this->firstUser->account_id,
+                'author_id' => $this->firstUser->id,
                 'type' => Vault::TYPE_PERSONAL,
                 'name' => $this->faker->firstName,
                 'description' => rand(1, 2) == 1 ? $this->faker->sentence() : null,
@@ -147,8 +164,8 @@ class SetupDummyAccount extends Command
                 $birthDate = Carbon::parse($date);
 
                 $contact = (new CreateContact)->execute([
-                    'account_id' => $this->user->account_id,
-                    'author_id' => $this->user->id,
+                    'account_id' => $this->firstUser->account_id,
+                    'author_id' => $this->firstUser->id,
                     'vault_id' => $vault->id,
                     'first_name' => $this->faker->firstName(),
                     'last_name' => $this->faker->lastName(),
@@ -159,8 +176,8 @@ class SetupDummyAccount extends Command
                 ]);
 
                 (new CreateContactImportantDate)->execute([
-                    'account_id' => $this->user->account_id,
-                    'author_id' => $this->user->id,
+                    'account_id' => $this->firstUser->account_id,
+                    'author_id' => $this->firstUser->id,
                     'vault_id' => $vault->id,
                     'contact_id' => $contact->id,
                     'label' => 'Birthdate',
@@ -180,8 +197,8 @@ class SetupDummyAccount extends Command
         foreach (Contact::all() as $contact) {
             for ($i = 0; $i < 4; $i++) {
                 (new CreateNote)->execute([
-                    'account_id' => $this->user->account_id,
-                    'author_id' => $this->user->id,
+                    'account_id' => $this->firstUser->account_id,
+                    'author_id' => $this->firstUser->id,
                     'vault_id' => $contact->vault_id,
                     'contact_id' => $contact->id,
                     'title' => rand(1, 2) == 1 ? $this->faker->sentence(rand(3, 6)) : null,
@@ -198,8 +215,8 @@ class SetupDummyAccount extends Command
         foreach (Contact::all() as $contact) {
             for ($i = 0; $i < 4; $i++) {
                 (new CreateContactTask)->execute([
-                    'account_id' => $this->user->account_id,
-                    'author_id' => $this->user->id,
+                    'account_id' => $this->firstUser->account_id,
+                    'author_id' => $this->firstUser->id,
                     'vault_id' => $contact->vault_id,
                     'contact_id' => $contact->id,
                     'label' => $this->faker->sentence(rand(3, 6)),
diff --git a/app/Helpers/UserHelper.php b/app/Helpers/UserHelper.php
new file mode 100644
index 000000000..abe6ef479
--- /dev/null
+++ b/app/Helpers/UserHelper.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Helpers;
+
+use App\Models\User;
+use App\Models\Vault;
+
+class UserHelper
+{
+    /**
+     * Get the information about the contact linked to the given user, in the
+     * given vault.
+     *
+     * @return null|array
+     */
+    public static function getInformationAboutContact(User $user, Vault $vault): ?array
+    {
+        $contact = $user->getContactInVault($vault);
+
+        if (! $contact) {
+            return null;
+        }
+
+        return [
+            'id' => $contact->id,
+            'name' => $contact->getName($user),
+            'avatar' => AvatarHelper::getSVG($contact),
+        ];
+    }
+}
diff --git a/app/Helpers/WallpaperHelper.php b/app/Helpers/WallpaperHelper.php
index ab752c18e..6342ea969 100644
--- a/app/Helpers/WallpaperHelper.php
+++ b/app/Helpers/WallpaperHelper.php
@@ -2,8 +2,6 @@
 
 namespace App\Helpers;
 
-use App\Models\Wallpaper;
-
 class WallpaperHelper
 {
     /**
diff --git a/app/Models/ContactFeedItem.php b/app/Models/ContactFeedItem.php
index 0ba5445dc..06f7bf0fa 100644
--- a/app/Models/ContactFeedItem.php
+++ b/app/Models/ContactFeedItem.php
@@ -16,11 +16,16 @@ class ContactFeedItem extends Model
     /**
      * Possible actions.
      */
+    const ACTION_CONTACT_INFORMATION_UPDATED = 'contact_information_updated';
+    const ACTION_JOB_INFORMATION_UPDATED = 'job_information_updated';
     const ACTION_NOTE_CREATED = 'note_created';
     const ACTION_NOTE_UPDATED = 'note_updated';
+    const ACTION_NOTE_DESTROYED = 'note_destroyed';
     const ACTION_IMPORTANT_DATE_CREATED = 'important_date_created';
     const ACTION_IMPORTANT_DATE_UPDATED = 'important_date_updated';
-    const ACTION_LABEL_ADDED = 'label_added';
+    const ACTION_IMPORTANT_DATE_DESTROYED = 'important_date_destroyed';
+    const ACTION_LABEL_ASSIGNED = 'label_assigned';
+    const ACTION_LABEL_REMOVED = 'label_removed';
     const ACTION_LOAN_CREATED = 'loan_created';
     const ACTION_LOAN_UPDATED = 'loan_updated';
 
@@ -30,12 +35,24 @@ class ContactFeedItem extends Model
      * @var array
      */
     protected $fillable = [
+        'author_id',
         'contact_id',
         'action',
+        'description',
         'feedable_id',
         'feedable_type',
     ];
 
+    /**
+     * Get the user associated with the contact feed item.
+     *
+     * @return BelongsTo
+     */
+    public function author()
+    {
+        return $this->belongsTo(User::class, 'author_id');
+    }
+
     /**
      * Get the contact associated with the contact feed item.
      *
diff --git a/app/Models/ContactImportantDate.php b/app/Models/ContactImportantDate.php
index 57f69d8b8..0a702a5f8 100644
--- a/app/Models/ContactImportantDate.php
+++ b/app/Models/ContactImportantDate.php
@@ -58,4 +58,12 @@ class ContactImportantDate extends Model
     {
         return $this->belongsTo(ContactImportantDateType::class);
     }
+
+    /**
+     * Get the important date's feed item.
+     */
+    public function feedItem()
+    {
+        return $this->morphOne(ContactFeedItem::class, 'feedable');
+    }
 }
diff --git a/app/Models/Note.php b/app/Models/Note.php
index 5ff2d5845..42c9ac980 100644
--- a/app/Models/Note.php
+++ b/app/Models/Note.php
@@ -20,7 +20,6 @@ class Note extends Model
         'contact_id',
         'author_id',
         'emotion_id',
-        'author_name',
         'title',
         'body',
     ];
diff --git a/app/Models/User.php b/app/Models/User.php
index 32e66eeeb..7a900f478 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -4,6 +4,7 @@ namespace App\Models;
 
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -134,14 +135,24 @@ class User extends Authenticatable implements MustVerifyEmail
      * All users have a contact in the vaults.
      *
      * @param  Vault  $vault
-     * @return Contact
+     * @return null|Contact
      */
-    public function getContactInVault(Vault $vault): Contact
+    public function getContactInVault(Vault $vault): ?Contact
     {
         $contact = DB::table('user_vault')->where('vault_id', $vault->id)
             ->where('user_id', $this->id)
             ->first();
 
-        return Contact::findOrFail($contact->contact_id);
+        if (! $contact) {
+            return null;
+        }
+
+        try {
+            $contact = Contact::findOrFail($contact->contact_id);
+        } catch (ModelNotFoundException) {
+            return null;
+        }
+
+        return $contact;
     }
 }
diff --git a/database/factories/ContactFeedItemFactory.php b/database/factories/ContactFeedItemFactory.php
index 03e3c9848..b5ce66fe2 100644
--- a/database/factories/ContactFeedItemFactory.php
+++ b/database/factories/ContactFeedItemFactory.php
@@ -4,6 +4,7 @@ namespace Database\Factories;
 
 use App\Models\Contact;
 use App\Models\ContactFeedItem;
+use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 class ContactFeedItemFactory extends Factory
@@ -23,8 +24,10 @@ class ContactFeedItemFactory extends Factory
     public function definition()
     {
         return [
+            'author_id' => User::factory(),
             'contact_id' => Contact::factory(),
             'action' => ContactFeedItem::ACTION_NOTE_CREATED,
+            'description' => $this->faker->word(),
         ];
     }
 }
diff --git a/database/factories/NoteFactory.php b/database/factories/NoteFactory.php
index 73e8424da..4a04bf02c 100644
--- a/database/factories/NoteFactory.php
+++ b/database/factories/NoteFactory.php
@@ -26,7 +26,6 @@ class NoteFactory extends Factory
         return [
             'contact_id' => Contact::factory(),
             'author_id' => User::factory(),
-            'author_name' => $this->faker->name(),
             'title' => $this->faker->title(),
             'body' => $this->faker->sentence(),
         ];
diff --git a/database/migrations/2020_04_25_133132_create_contacts_table.php b/database/migrations/2020_04_25_133132_create_contacts_table.php
index 8be839bb2..391ea51b9 100644
--- a/database/migrations/2020_04_25_133132_create_contacts_table.php
+++ b/database/migrations/2020_04_25_133132_create_contacts_table.php
@@ -41,12 +41,12 @@ class CreateContactsTable extends Migration
         Schema::create('user_vault', function (Blueprint $table) {
             $table->unsignedBigInteger('vault_id');
             $table->unsignedBigInteger('user_id');
-            $table->unsignedBigInteger('contact_id')->nullable();
+            $table->unsignedBigInteger('contact_id');
             $table->integer('permission');
             $table->timestamps();
             $table->foreign('vault_id')->references('id')->on('vaults')->onDelete('cascade');
             $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
-            $table->foreign('contact_id')->references('id')->on('contacts')->onDelete('set null');
+            $table->foreign('contact_id')->references('id')->on('contacts')->onDelete('cascade');
         });
 
         Schema::create('contact_vault_user', function (Blueprint $table) {
diff --git a/database/migrations/2021_10_19_022411_create_contact_feed_table.php b/database/migrations/2021_10_19_022411_create_contact_feed_table.php
index 549f7b015..484883041 100644
--- a/database/migrations/2021_10_19_022411_create_contact_feed_table.php
+++ b/database/migrations/2021_10_19_022411_create_contact_feed_table.php
@@ -16,11 +16,14 @@ class CreateContactFeedTable extends Migration
 
         Schema::create('contact_feed_items', function (Blueprint $table) {
             $table->id();
+            $table->unsignedBigInteger('author_id')->nullable();
             $table->unsignedBigInteger('contact_id');
             $table->string('action');
+            $table->string('description')->nullable();
             $table->unsignedBigInteger('feedable_id')->nullable();
             $table->string('feedable_type')->nullable();
             $table->timestamps();
+            $table->foreign('author_id')->references('id')->on('users')->onDelete('set null');
             $table->foreign('contact_id')->references('id')->on('contacts')->onDelete('cascade');
         });
     }
diff --git a/database/migrations/2021_10_21_013005_create_notes_table.php b/database/migrations/2021_10_21_013005_create_notes_table.php
index 09d5436be..a47f98484 100644
--- a/database/migrations/2021_10_21_013005_create_notes_table.php
+++ b/database/migrations/2021_10_21_013005_create_notes_table.php
@@ -19,7 +19,6 @@ class CreateNotesTable extends Migration
             $table->unsignedBigInteger('contact_id');
             $table->unsignedBigInteger('author_id')->nullable();
             $table->unsignedBigInteger('emotion_id')->nullable();
-            $table->string('author_name');
             $table->string('title')->nullable();
             $table->text('body');
             $table->timestamps();
diff --git a/domains/Contact/ManageContact/Services/UpdateContact.php b/domains/Contact/ManageContact/Services/UpdateContact.php
index fa935bfe3..1e748c0bf 100644
--- a/domains/Contact/ManageContact/Services/UpdateContact.php
+++ b/domains/Contact/ManageContact/Services/UpdateContact.php
@@ -6,6 +6,7 @@ use App\Interfaces\ServiceInterface;
 use App\Jobs\CreateAuditLog;
 use App\Jobs\CreateContactLog;
 use App\Models\Contact;
+use App\Models\ContactFeedItem;
 use App\Models\Gender;
 use App\Models\Pronoun;
 use App\Services\BaseService;
@@ -84,6 +85,7 @@ class UpdateContact extends BaseService implements ServiceInterface
         $this->contact->save();
 
         $this->log();
+        $this->createFeedItem();
 
         return $this->contact;
     }
@@ -124,4 +126,13 @@ class UpdateContact extends BaseService implements ServiceInterface
             'objects' => json_encode([]),
         ])->onQueue('low');
     }
+
+    private function createFeedItem(): void
+    {
+        ContactFeedItem::create([
+            'author_id' => $this->author->id,
+            'contact_id' => $this->contact->id,
+            'action' => ContactFeedItem::ACTION_CONTACT_INFORMATION_UPDATED,
+        ]);
+    }
 }
diff --git a/domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelper.php b/domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelper.php
index 9e388178d..c683664a9 100644
--- a/domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelper.php
+++ b/domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelper.php
@@ -2,7 +2,8 @@
 
 namespace App\Contact\ManageContactFeed\Web\ViewHelpers;
 
-use App\Contact\ManageNotes\Web\ViewHelpers\ModuleNotesViewHelper;
+use App\Helpers\DateHelper;
+use App\Helpers\UserHelper;
 use App\Models\Contact;
 use App\Models\ContactFeedItem;
 use App\Models\User;
@@ -15,23 +16,14 @@ class ModuleFeedViewHelper
             ->orderBy('created_at', 'desc')
             ->get();
 
-        $itemsCollection = $items->map(function ($item) use ($contact, $user) {
-            if ($item->action == ContactFeedItem::ACTION_NOTE_CREATED) {
-                $object = ModuleNotesViewHelper::dto($contact, $item->feedable, $user);
-            }
-
-            if ($item->action == ContactFeedItem::ACTION_IMPORTANT_DATE_CREATED) {
-                $object = trans('feed.important_date_created');
-            }
-
-            if ($item->action == ContactFeedItem::ACTION_IMPORTANT_DATE_UPDATED) {
-                $object = trans('feed.important_date_updated');
-            }
-
+        $itemsCollection = $items->map(function ($item) use ($user) {
             return [
                 'id' => $item->id,
                 'action' => $item->action,
-                'object' => $object,
+                'author' => self::getAuthor($item, $user),
+                'sentence' => self::getSentence($item),
+                'description' => $item->description,
+                'created_at' => DateHelper::format($item->created_at, $user),
             ];
         });
 
@@ -39,4 +31,34 @@ class ModuleFeedViewHelper
             'items' => $itemsCollection,
         ];
     }
+
+    private static function getSentence(ContactFeedItem $item): mixed
+    {
+        return trans('contact.feed_item_'.$item->action);
+    }
+
+    private static function getAuthor(ContactFeedItem $item, User $user): ?array
+    {
+        $author = $item->author;
+        if (! $author) {
+            $monicaSvg = '<svg viewBox="0 0 390 353" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path fill-rule="evenodd" clip-rule="evenodd" d="M198.147 353C289.425 353 390.705 294.334 377.899 181.5C365.093 68.6657 289.425 10 198.147 10C106.869 10 31.794 61.4285 12.2144 181.5C-7.36527 301.571 106.869 353 198.147 353Z" fill="#2C2B29"/>
+                <path fill-rule="evenodd" clip-rule="evenodd" d="M196.926 320C270.146 320 351.389 272.965 341.117 182.5C330.844 92.0352 270.146 45 196.926 45C123.705 45 63.4825 86.2328 47.7763 182.5C32.0701 278.767 123.705 320 196.926 320Z" fill="white"/>
+                <path fill-rule="evenodd" clip-rule="evenodd" d="M52.4154 132C62.3371 132.033 66.6473 96.5559 84.3659 80.4033C100.632 65.5752 138 60.4908 138 43.3473C138 7.52904 99.1419 0 64.8295 0C30.517 0 0 36.3305 0 72.1487C0 107.967 33.3855 131.937 52.4154 132Z" fill="#2C2B29"/>
+                <path fill-rule="evenodd" clip-rule="evenodd" d="M337.585 132C327.663 132.033 323.353 96.5559 305.634 80.4033C289.368 65.5752 252 60.4908 252 43.3473C252 7.52904 290.858 0 325.171 0C359.483 0 390 36.3305 390 72.1487C390 107.967 356.615 131.937 337.585 132Z" fill="#2C2B29"/>
+                <path fill-rule="evenodd" clip-rule="evenodd" d="M275.651 252.546C301.619 246.357 312.447 235.443 312.447 200.175C312.447 164.907 295.905 129.098 267.423 129.098C238.941 129.098 220.028 154.564 220.028 189.832C220.028 225.1 249.682 258.734 275.651 252.546Z" fill="#2B2A28"/>
+                <path fill-rule="evenodd" clip-rule="evenodd" d="M266.143 207.804C273.209 207.804 275.311 206.002 278.505 201.954C282.087 197.416 284.758 192.151 283.885 181.278C282.426 163.109 274.764 154.752 259.773 154.752C244.783 154.752 241.859 166.27 241.859 181.278C241.859 196.286 251.152 207.804 266.143 207.804Z" fill="white"/>
+                <path fill-rule="evenodd" clip-rule="evenodd" d="M115.349 252.546C89.3806 246.357 78.5526 235.443 78.5526 200.175C78.5526 164.907 95.0948 129.098 123.577 129.098C152.059 129.098 170.972 154.564 170.972 189.832C170.972 225.1 141.318 258.734 115.349 252.546Z" fill="#2B2A28"/>
+                <path fill-rule="evenodd" clip-rule="evenodd" d="M124.857 207.804C117.791 207.804 115.689 206.002 112.495 201.954C108.913 197.416 106.242 192.151 107.115 181.278C108.574 163.109 116.236 154.752 131.227 154.752C146.217 154.752 149.141 166.27 149.141 181.278C149.141 196.286 139.848 207.804 124.857 207.804Z" fill="white"/>
+                <path fill-rule="evenodd" clip-rule="evenodd" d="M196.204 276C210.316 276 224 255.244 224 246.342C224 237.441 210.112 236 196 236C181.888 236 168 237.441 168 246.342C168 255.244 182.092 276 196.204 276Z" fill="#2C2B29"/>
+            </svg>';
+
+            return [
+                'name' => trans('contact.feed_item_author_deleted'),
+                'avatar' => $monicaSvg,
+            ];
+        }
+
+        return UserHelper::getInformationAboutContact($author, $item->contact->vault);
+    }
 }
diff --git a/domains/Contact/ManageContactImportantDates/Services/CreateContactImportantDate.php b/domains/Contact/ManageContactImportantDates/Services/CreateContactImportantDate.php
index 3ca50f0bd..5715b4fd9 100644
--- a/domains/Contact/ManageContactImportantDates/Services/CreateContactImportantDate.php
+++ b/domains/Contact/ManageContactImportantDates/Services/CreateContactImportantDate.php
@@ -2,6 +2,7 @@
 
 namespace App\Contact\ManageContactImportantDates\Services;
 
+use App\Helpers\ImportantDateHelper;
 use App\Interfaces\ServiceInterface;
 use App\Jobs\CreateAuditLog;
 use App\Jobs\CreateContactLog;
@@ -71,6 +72,7 @@ class CreateContactImportantDate extends BaseService implements ServiceInterface
         ]);
 
         $this->log();
+        $this->createFeedItem();
 
         return $this->date;
     }
@@ -109,10 +111,17 @@ class CreateContactImportantDate extends BaseService implements ServiceInterface
                 'label' => $this->date->label,
             ]),
         ])->onQueue('low');
+    }
 
-        ContactFeedItem::create([
+    private function createFeedItem(): void
+    {
+        $feedItem = ContactFeedItem::create([
+            'author_id' => $this->author->id,
             'contact_id' => $this->contact->id,
             'action' => ContactFeedItem::ACTION_IMPORTANT_DATE_CREATED,
+            'description' => $this->date->label.' '.ImportantDateHelper::formatDate($this->date, $this->author),
         ]);
+
+        $this->date->feedItem()->save($feedItem);
     }
 }
diff --git a/domains/Contact/ManageContactImportantDates/Services/DestroyContactImportantDate.php b/domains/Contact/ManageContactImportantDates/Services/DestroyContactImportantDate.php
index f2fb5dc95..b3d742603 100644
--- a/domains/Contact/ManageContactImportantDates/Services/DestroyContactImportantDate.php
+++ b/domains/Contact/ManageContactImportantDates/Services/DestroyContactImportantDate.php
@@ -2,10 +2,12 @@
 
 namespace App\Contact\ManageContactImportantDates\Services;
 
+use App\Helpers\ImportantDateHelper;
 use App\Interfaces\ServiceInterface;
 use App\Jobs\CreateAuditLog;
 use App\Jobs\CreateContactLog;
 use App\Models\Address;
+use App\Models\ContactFeedItem;
 use App\Models\ContactImportantDate;
 use App\Services\BaseService;
 use Carbon\Carbon;
@@ -63,6 +65,7 @@ class DestroyContactImportantDate extends BaseService implements ServiceInterfac
         $this->contact->save();
 
         $this->log();
+        $this->createFeedItem();
     }
 
     private function log(): void
@@ -87,4 +90,14 @@ class DestroyContactImportantDate extends BaseService implements ServiceInterfac
             ]),
         ])->onQueue('low');
     }
+
+    private function createFeedItem(): void
+    {
+        ContactFeedItem::create([
+            'author_id' => $this->author->id,
+            'contact_id' => $this->contact->id,
+            'action' => ContactFeedItem::ACTION_IMPORTANT_DATE_DESTROYED,
+            'description' => $this->date->label.' '.ImportantDateHelper::formatDate($this->date, $this->author),
+        ]);
+    }
 }
diff --git a/domains/Contact/ManageContactImportantDates/Services/UpdateContactImportantDate.php b/domains/Contact/ManageContactImportantDates/Services/UpdateContactImportantDate.php
index a32263930..524fde26f 100644
--- a/domains/Contact/ManageContactImportantDates/Services/UpdateContactImportantDate.php
+++ b/domains/Contact/ManageContactImportantDates/Services/UpdateContactImportantDate.php
@@ -2,6 +2,7 @@
 
 namespace App\Contact\ManageContactImportantDates\Services;
 
+use App\Helpers\ImportantDateHelper;
 use App\Interfaces\ServiceInterface;
 use App\Jobs\CreateAuditLog;
 use App\Jobs\CreateContactLog;
@@ -64,6 +65,7 @@ class UpdateContactImportantDate extends BaseService implements ServiceInterface
         $this->validate();
         $this->update();
         $this->log();
+        $this->createFeedItem();
 
         return $this->date;
     }
@@ -118,10 +120,17 @@ class UpdateContactImportantDate extends BaseService implements ServiceInterface
                 'label' => $this->date->label,
             ]),
         ])->onQueue('low');
+    }
 
-        ContactFeedItem::create([
+    private function createFeedItem(): void
+    {
+        $feedItem = ContactFeedItem::create([
+            'author_id' => $this->author->id,
             'contact_id' => $this->contact->id,
             'action' => ContactFeedItem::ACTION_IMPORTANT_DATE_UPDATED,
+            'description' => $this->date->label.' '.ImportantDateHelper::formatDate($this->date, $this->author),
         ]);
+
+        $this->date->feedItem()->save($feedItem);
     }
 }
diff --git a/domains/Contact/ManageContactImportantDates/Web/Controllers/ContactImportantDatesController.php b/domains/Contact/ManageContactImportantDates/Web/Controllers/ContactImportantDatesController.php
index 30b487355..b727e4280 100644
--- a/domains/Contact/ManageContactImportantDates/Web/Controllers/ContactImportantDatesController.php
+++ b/domains/Contact/ManageContactImportantDates/Web/Controllers/ContactImportantDatesController.php
@@ -110,7 +110,7 @@ class ContactImportantDatesController extends Controller
             'vault_id' => $vaultId,
             'contact_id' => $contactId,
             'contact_important_date_id' => $dateId,
-            'contact_important_date_type_id' => $request->input('contact_important_date_type_id'),
+            'contact_important_date_type_id' => $request->input('contact_important_date_type_id') == 0 ? null : $request->input('contact_important_date_type_id'),
             'label' => $request->input('label'),
             'day' => $day,
             'month' => $month,
diff --git a/domains/Contact/ManageJobInformation/Services/UpdateJobInformation.php b/domains/Contact/ManageJobInformation/Services/UpdateJobInformation.php
index 97c22f741..35e35e28f 100644
--- a/domains/Contact/ManageJobInformation/Services/UpdateJobInformation.php
+++ b/domains/Contact/ManageJobInformation/Services/UpdateJobInformation.php
@@ -5,6 +5,7 @@ namespace App\Contact\ManageJobInformation\Services;
 use App\Interfaces\ServiceInterface;
 use App\Models\Company;
 use App\Models\Contact;
+use App\Models\ContactFeedItem;
 use App\Services\BaseService;
 
 class UpdateJobInformation extends BaseService implements ServiceInterface
@@ -62,6 +63,12 @@ class UpdateJobInformation extends BaseService implements ServiceInterface
         $this->contact->job_position = $this->valueOrNull($data, 'job_position');
         $this->contact->save();
 
+        ContactFeedItem::create([
+            'author_id' => $this->author->id,
+            'contact_id' => $this->contact->id,
+            'action' => ContactFeedItem::ACTION_JOB_INFORMATION_UPDATED,
+        ]);
+
         return $this->contact;
     }
 }
diff --git a/domains/Contact/ManageLabels/Services/AssignLabel.php b/domains/Contact/ManageLabels/Services/AssignLabel.php
index 2af0d27c1..e34a895f0 100644
--- a/domains/Contact/ManageLabels/Services/AssignLabel.php
+++ b/domains/Contact/ManageLabels/Services/AssignLabel.php
@@ -5,6 +5,7 @@ namespace App\Contact\ManageLabels\Services;
 use App\Interfaces\ServiceInterface;
 use App\Jobs\CreateAuditLog;
 use App\Jobs\CreateContactLog;
+use App\Models\ContactFeedItem;
 use App\Models\Label;
 use App\Services\BaseService;
 use Carbon\Carbon;
@@ -63,6 +64,7 @@ class AssignLabel extends BaseService implements ServiceInterface
         $this->contact->save();
 
         $this->log();
+        $this->createFeedItem();
 
         return $this->label;
     }
@@ -91,4 +93,14 @@ class AssignLabel extends BaseService implements ServiceInterface
             ]),
         ])->onQueue('low');
     }
+
+    private function createFeedItem(): void
+    {
+        ContactFeedItem::create([
+            'author_id' => $this->author->id,
+            'contact_id' => $this->contact->id,
+            'action' => ContactFeedItem::ACTION_LABEL_ASSIGNED,
+            'description' => $this->label->name,
+        ]);
+    }
 }
diff --git a/domains/Contact/ManageLabels/Services/RemoveLabel.php b/domains/Contact/ManageLabels/Services/RemoveLabel.php
index 1128c978c..4a2cfd885 100644
--- a/domains/Contact/ManageLabels/Services/RemoveLabel.php
+++ b/domains/Contact/ManageLabels/Services/RemoveLabel.php
@@ -5,6 +5,7 @@ namespace App\Contact\ManageLabels\Services;
 use App\Interfaces\ServiceInterface;
 use App\Jobs\CreateAuditLog;
 use App\Jobs\CreateContactLog;
+use App\Models\ContactFeedItem;
 use App\Models\Label;
 use App\Services\BaseService;
 use Carbon\Carbon;
@@ -63,6 +64,7 @@ class RemoveLabel extends BaseService implements ServiceInterface
         $this->contact->save();
 
         $this->log();
+        $this->createFeedItem();
 
         return $this->label;
     }
@@ -91,4 +93,14 @@ class RemoveLabel extends BaseService implements ServiceInterface
             ]),
         ])->onQueue('low');
     }
+
+    private function createFeedItem(): void
+    {
+        ContactFeedItem::create([
+            'author_id' => $this->author->id,
+            'contact_id' => $this->contact->id,
+            'action' => ContactFeedItem::ACTION_LABEL_REMOVED,
+            'description' => $this->label->name,
+        ]);
+    }
 }
diff --git a/domains/Contact/ManageNotes/Services/CreateNote.php b/domains/Contact/ManageNotes/Services/CreateNote.php
index 191847c35..19fff1679 100644
--- a/domains/Contact/ManageNotes/Services/CreateNote.php
+++ b/domains/Contact/ManageNotes/Services/CreateNote.php
@@ -10,6 +10,7 @@ use App\Models\Emotion;
 use App\Models\Note;
 use App\Services\BaseService;
 use Carbon\Carbon;
+use Illuminate\Support\Str;
 
 class CreateNote extends BaseService implements ServiceInterface
 {
@@ -67,7 +68,6 @@ class CreateNote extends BaseService implements ServiceInterface
         $this->note = Note::create([
             'contact_id' => $this->contact->id,
             'author_id' => $this->author->id,
-            'author_name' => $this->author->name,
             'title' => $this->valueOrNull($data, 'title'),
             'body' => $data['body'],
             'emotion_id' => $this->valueOrNull($data, 'emotion_id'),
@@ -77,7 +77,6 @@ class CreateNote extends BaseService implements ServiceInterface
         $this->contact->save();
 
         $this->log();
-
         $this->createFeedItem();
 
         return $this->note;
@@ -111,8 +110,10 @@ class CreateNote extends BaseService implements ServiceInterface
     private function createFeedItem(): void
     {
         $feedItem = ContactFeedItem::create([
+            'author_id' => $this->author->id,
             'contact_id' => $this->contact->id,
             'action' => ContactFeedItem::ACTION_NOTE_CREATED,
+            'description' => Str::words($this->note->body, 10, '…'),
         ]);
         $this->note->feedItem()->save($feedItem);
     }
diff --git a/domains/Contact/ManageNotes/Services/DestroyNote.php b/domains/Contact/ManageNotes/Services/DestroyNote.php
index 6f0f22fa1..a060a501f 100644
--- a/domains/Contact/ManageNotes/Services/DestroyNote.php
+++ b/domains/Contact/ManageNotes/Services/DestroyNote.php
@@ -5,9 +5,11 @@ namespace App\Contact\ManageNotes\Services;
 use App\Interfaces\ServiceInterface;
 use App\Jobs\CreateAuditLog;
 use App\Jobs\CreateContactLog;
+use App\Models\ContactFeedItem;
 use App\Models\Note;
 use App\Services\BaseService;
 use Carbon\Carbon;
+use Illuminate\Support\Str;
 
 class DestroyNote extends BaseService implements ServiceInterface
 {
@@ -56,8 +58,7 @@ class DestroyNote extends BaseService implements ServiceInterface
         $this->note = Note::where('contact_id', $data['contact_id'])
             ->findOrFail($data['note_id']);
 
-        $this->removeContactFeedItem();
-
+        $this->createFeedItem();
         $this->note->delete();
 
         $this->contact->last_updated_at = Carbon::now();
@@ -88,8 +89,13 @@ class DestroyNote extends BaseService implements ServiceInterface
         ])->onQueue('low');
     }
 
-    private function removeContactFeedItem(): void
+    private function createFeedItem(): void
     {
-        $this->note->feedItem->delete();
+        ContactFeedItem::create([
+            'author_id' => $this->author->id,
+            'contact_id' => $this->contact->id,
+            'action' => ContactFeedItem::ACTION_NOTE_DESTROYED,
+            'description' => Str::words($this->note->body, 10, '…'),
+        ]);
     }
 }
diff --git a/domains/Contact/ManageNotes/Services/UpdateNote.php b/domains/Contact/ManageNotes/Services/UpdateNote.php
index 01a1d4742..df96dc735 100644
--- a/domains/Contact/ManageNotes/Services/UpdateNote.php
+++ b/domains/Contact/ManageNotes/Services/UpdateNote.php
@@ -5,10 +5,12 @@ namespace App\Contact\ManageNotes\Services;
 use App\Interfaces\ServiceInterface;
 use App\Jobs\CreateAuditLog;
 use App\Jobs\CreateContactLog;
+use App\Models\ContactFeedItem;
 use App\Models\Emotion;
 use App\Models\Note;
 use App\Services\BaseService;
 use Carbon\Carbon;
+use Illuminate\Support\Str;
 
 class UpdateNote extends BaseService implements ServiceInterface
 {
@@ -76,6 +78,7 @@ class UpdateNote extends BaseService implements ServiceInterface
         $this->contact->save();
 
         $this->log();
+        $this->createFeedItem();
 
         return $this->note;
     }
@@ -104,4 +107,15 @@ class UpdateNote extends BaseService implements ServiceInterface
             ]),
         ])->onQueue('low');
     }
+
+    private function createFeedItem(): void
+    {
+        $feedItem = ContactFeedItem::create([
+            'author_id' => $this->author->id,
+            'contact_id' => $this->contact->id,
+            'action' => ContactFeedItem::ACTION_NOTE_UPDATED,
+            'description' => Str::words($this->note->body, 10, '…'),
+        ]);
+        $this->note->feedItem()->save($feedItem);
+    }
 }
diff --git a/domains/Contact/ManageNotes/Web/ViewHelpers/ModuleNotesViewHelper.php b/domains/Contact/ManageNotes/Web/ViewHelpers/ModuleNotesViewHelper.php
index 9d09647e7..26d50e756 100644
--- a/domains/Contact/ManageNotes/Web/ViewHelpers/ModuleNotesViewHelper.php
+++ b/domains/Contact/ManageNotes/Web/ViewHelpers/ModuleNotesViewHelper.php
@@ -3,6 +3,7 @@
 namespace App\Contact\ManageNotes\Web\ViewHelpers;
 
 use App\Helpers\DateHelper;
+use App\Helpers\UserHelper;
 use App\Models\Contact;
 use App\Models\Note;
 use App\Models\User;
@@ -53,7 +54,7 @@ class ModuleNotesViewHelper
                 'id' => $note->emotion->id,
                 'name' => $note->emotion->name,
             ] : null,
-            'author' => $note->author ? $note->author->name : $note->author_name,
+            'author' => $note->author ? UserHelper::getInformationAboutContact($note->author, $contact->vault) : null,
             'written_at' => DateHelper::format($note->created_at, $user),
             'url' => [
                 'update' => route('contact.note.update', [
diff --git a/domains/Vault/ManageVaultSettings/Services/CreateLabel.php b/domains/Vault/ManageVaultSettings/Services/CreateLabel.php
index 79ed317ec..4a78c0dca 100644
--- a/domains/Vault/ManageVaultSettings/Services/CreateLabel.php
+++ b/domains/Vault/ManageVaultSettings/Services/CreateLabel.php
@@ -10,6 +10,9 @@ use Illuminate\Support\Str;
 
 class CreateLabel extends BaseService implements ServiceInterface
 {
+    private array $data;
+    private Label $label;
+
     /**
      * Get the validation rules that apply to the service.
      *
@@ -52,7 +55,7 @@ class CreateLabel extends BaseService implements ServiceInterface
     {
         $this->validateRules($data);
 
-        $label = Label::create([
+        $this->label = Label::create([
             'vault_id' => $data['vault_id'],
             'name' => $data['name'],
             'description' => $this->valueOrNull($data, 'description'),
@@ -61,16 +64,21 @@ class CreateLabel extends BaseService implements ServiceInterface
             'text_color' => $data['text_color'],
         ]);
 
+        $this->log();
+
+        return $this->label;
+    }
+
+    private function log(): void
+    {
         CreateAuditLog::dispatch([
             'account_id' => $this->author->account_id,
             'author_id' => $this->author->id,
             'author_name' => $this->author->name,
             'action_name' => 'label_created',
             'objects' => json_encode([
-                'label_name' => $label->name,
+                'label_name' => $this->label->name,
             ]),
         ])->onQueue('low');
-
-        return $label;
     }
 }
diff --git a/domains/Vault/ManageVaultSettings/Services/GrantVaultAccessToUser.php b/domains/Vault/ManageVaultSettings/Services/GrantVaultAccessToUser.php
index 1281c2b20..0e00d5d6d 100644
--- a/domains/Vault/ManageVaultSettings/Services/GrantVaultAccessToUser.php
+++ b/domains/Vault/ManageVaultSettings/Services/GrantVaultAccessToUser.php
@@ -4,6 +4,7 @@ namespace App\Vault\ManageVaultSettings\Services;
 
 use App\Contact\ManageReminders\Services\ScheduleContactReminderForUser;
 use App\Exceptions\SameUserException;
+use App\Helpers\AvatarHelper;
 use App\Helpers\VaultHelper;
 use App\Interfaces\ServiceInterface;
 use App\Jobs\CreateAuditLog;
@@ -84,12 +85,18 @@ class GrantVaultAccessToUser extends BaseService implements ServiceInterface
             'first_name' => $this->user->first_name,
             'last_name' => $this->user->last_name,
             'can_be_deleted' => false,
+            'template_id' => $this->vault->default_template_id,
         ]);
 
         $this->vault->users()->save($this->user, [
             'permission' => $this->data['permission'],
             'contact_id' => $contact->id,
         ]);
+
+        $avatar = AvatarHelper::generateRandomAvatar($contact);
+
+        $contact->avatar_id = $avatar->id;
+        $contact->save();
     }
 
     /**
diff --git a/resources/js/Pages/Vault/Contact/ImportantDates/Index.vue b/resources/js/Pages/Vault/Contact/ImportantDates/Index.vue
index 09a960fac..16ebe4fb5 100644
--- a/resources/js/Pages/Vault/Contact/ImportantDates/Index.vue
+++ b/resources/js/Pages/Vault/Contact/ImportantDates/Index.vue
@@ -470,7 +470,7 @@ export default {
         label: '',
         date: '',
         age: '',
-        contact_important_date_type_id: 0,
+        contact_important_date_type_id: null,
         reminder: false,
         reminderChoice: '',
         errors: [],
diff --git a/resources/js/Shared/Form/PrettyButton.vue b/resources/js/Shared/Form/PrettyButton.vue
index 7607ff5af..67147dc71 100644
--- a/resources/js/Shared/Form/PrettyButton.vue
+++ b/resources/js/Shared/Form/PrettyButton.vue
@@ -49,7 +49,7 @@ button {
     <svg
       v-if="icon === 'plus' && state != 'loading'"
       xmlns="http://www.w3.org/2000/svg"
-      class="icon relative inline h-5 w-5"
+      class="icon relative mr-1 inline h-5 w-5"
       fill="none"
       viewBox="0 0 24 24"
       stroke="currentColor">
@@ -60,7 +60,7 @@ button {
     <svg
       v-if="icon === 'check' && state != 'loading'"
       xmlns="http://www.w3.org/2000/svg"
-      class="icon relative inline h-5 w-5"
+      class="icon relative mr-1 inline h-5 w-5"
       fill="none"
       viewBox="0 0 24 24"
       stroke="currentColor">
@@ -75,7 +75,7 @@ button {
     <svg
       v-if="icon === 'arrow' && state != 'loading'"
       xmlns="http://www.w3.org/2000/svg"
-      class="icon relative ml-1 inline h-5 w-5"
+      class="icon relative ml-1 mr-1 inline h-5 w-5"
       fill="none"
       viewBox="0 0 24 24"
       stroke="currentColor">
diff --git a/resources/js/Shared/Modules/Calls.vue b/resources/js/Shared/Modules/Calls.vue
index 1d972efe3..f92be5a32 100644
--- a/resources/js/Shared/Modules/Calls.vue
+++ b/resources/js/Shared/Modules/Calls.vue
@@ -43,7 +43,7 @@
 
         <span class="font-semibold">Calls</span>
       </div>
-      <pretty-span @click="showCreateCallModal()" :text="'Log a call'" :icon="'plus'" :classes="'sm:w-fit w-full'" />
+      <pretty-button @click="showCreateCallModal()" :text="'Log a call'" :icon="'plus'" :classes="'sm:w-fit w-full'" />
     </div>
 
     <!-- add a call modal -->
@@ -234,7 +234,7 @@
 
       <div class="flex justify-between p-5">
         <pretty-span :text="'Cancel'" :classes="'mr-3'" @click="createCallModalShown = false" />
-        <pretty-button :text="'Add date'" :state="loadingState" :icon="'plus'" :classes="'save'" />
+        <pretty-button :text="'Save'" :state="loadingState" :icon="'plus'" :classes="'save'" />
       </div>
     </form>
 
diff --git a/resources/js/Shared/Modules/ContactName.vue b/resources/js/Shared/Modules/ContactName.vue
index 09026811b..cc6d84572 100644
--- a/resources/js/Shared/Modules/ContactName.vue
+++ b/resources/js/Shared/Modules/ContactName.vue
@@ -2,10 +2,6 @@
 .icon-sidebar {
   top: -2px;
 }
-
-.icon-note {
-  top: -1px;
-}
 </style>
 
 <template>
diff --git a/resources/js/Shared/Modules/Feed.vue b/resources/js/Shared/Modules/Feed.vue
index 5a4fc1e9d..5f7df347d 100644
--- a/resources/js/Shared/Modules/Feed.vue
+++ b/resources/js/Shared/Modules/Feed.vue
@@ -1,21 +1,36 @@
 <style lang="scss" scoped>
-.icon-sidebar {
-  color: #737e8d;
-  top: -2px;
-}
-
-.icon-note {
+.icon-avatar {
   top: -1px;
+  left: -12px;
 }
 </style>
 
 <template>
   <div class="mb-4">
-    <div v-for="item in data.items" :key="item.id">
-      <note v-if="item.action == 'note_created'" :note="item.object" />
+    <div class="ml-4 border-l border-gray-200">
+      <div v-for="feedItem in data.items" :key="feedItem.id" class="mb-8">
+        <!-- action & user -->
+        <div class="mb-3 flex">
+          <div class="relative w-6">
+            <div v-html="feedItem.author.avatar" class="icon-avatar relative h-6 w-6"></div>
+          </div>
 
-      <feed-item v-if="item.action == 'important_date_created'" :message="item.object" />
-      <feed-item v-if="item.action == 'important_date_updated'" :message="item.object" />
+          <div>
+            <p class="mr-2 inline text-gray-400">
+              <span class="font-medium text-gray-800">{{ feedItem.author.name }}</span> {{ feedItem.sentence }}
+            </p>
+            <p class="mr-2 inline">•</p>
+            <p class="inline text-sm text-gray-400">{{ feedItem.created_at }}</p>
+          </div>
+        </div>
+
+        <!-- details -->
+        <div v-if="feedItem.description" class="ml-6">
+          <div class="rounded-lg border border-gray-300 px-3 py-2">
+            <span class="text-sm">{{ feedItem.description }}</span>
+          </div>
+        </div>
+      </div>
     </div>
 
     <!-- blank state -->
diff --git a/resources/js/Shared/Modules/GenderPronoun.vue b/resources/js/Shared/Modules/GenderPronoun.vue
index f00cf249f..88af2b05c 100644
--- a/resources/js/Shared/Modules/GenderPronoun.vue
+++ b/resources/js/Shared/Modules/GenderPronoun.vue
@@ -2,10 +2,6 @@
 .icon-sidebar {
   top: -2px;
 }
-
-.icon-note {
-  top: -1px;
-}
 </style>
 
 <template>
diff --git a/resources/js/Shared/Modules/JobInformation.vue b/resources/js/Shared/Modules/JobInformation.vue
index 636b17dd0..093e19338 100644
--- a/resources/js/Shared/Modules/JobInformation.vue
+++ b/resources/js/Shared/Modules/JobInformation.vue
@@ -3,10 +3,6 @@
   top: -2px;
 }
 
-.icon-note {
-  top: -1px;
-}
-
 .label-list {
   border-bottom-left-radius: 8px;
   border-bottom-right-radius: 8px;
diff --git a/resources/js/Shared/Modules/Loans.vue b/resources/js/Shared/Modules/Loans.vue
index a621a5dc6..e3ff90e11 100644
--- a/resources/js/Shared/Modules/Loans.vue
+++ b/resources/js/Shared/Modules/Loans.vue
@@ -4,10 +4,6 @@
   top: -2px;
 }
 
-.icon-note {
-  top: -1px;
-}
-
 .item-list {
   &:hover {
     border-top-left-radius: 8px;
diff --git a/resources/js/Shared/Modules/Notes.vue b/resources/js/Shared/Modules/Notes.vue
index f9515a15f..e160c1c69 100644
--- a/resources/js/Shared/Modules/Notes.vue
+++ b/resources/js/Shared/Modules/Notes.vue
@@ -7,6 +7,10 @@
 .icon-note {
   top: -1px;
 }
+
+.icon-avatar {
+  top: 2px;
+}
 </style>
 
 <template>
@@ -131,7 +135,7 @@
           <!-- details -->
           <div
             class="flex justify-between border-t border-gray-200 px-3 py-1 text-xs text-gray-600 hover:rounded-b hover:bg-slate-50">
-            <div>
+            <div class="flex items-center">
               <!-- emotion -->
               <div v-if="note.emotion" class="relative mr-3 inline">
                 {{ note.emotion.name }}
@@ -155,20 +159,11 @@
               </div>
 
               <!-- author -->
-              <div class="relative mr-3 inline">
-                <svg
-                  xmlns="http://www.w3.org/2000/svg"
-                  class="icon-note relative inline h-3 w-3 text-gray-400"
-                  fill="none"
-                  viewBox="0 0 24 24"
-                  stroke="currentColor">
-                  <path
-                    stroke-linecap="round"
-                    stroke-linejoin="round"
-                    stroke-width="2"
-                    d="M5.121 17.804A13.937 13.937 0 0112 16c2.5 0 4.847.655 6.879 1.804M15 10a3 3 0 11-6 0 3 3 0 016 0zm6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
-                </svg>
-                {{ note.author }}
+              <div v-if="note.author" class="relative mr-3 inline">
+                <div class="relative flex">
+                  <div v-html="note.author.avatar" class="icon-avatar relative mr-1 h-3 w-3"></div>
+                  <span></span>{{ note.author.name }}
+                </div>
               </div>
             </div>
             <div>
diff --git a/resources/js/Shared/Modules/Tasks.vue b/resources/js/Shared/Modules/Tasks.vue
index 73e9e8da0..090fc3ec0 100644
--- a/resources/js/Shared/Modules/Tasks.vue
+++ b/resources/js/Shared/Modules/Tasks.vue
@@ -19,6 +19,10 @@
     border-bottom-right-radius: 8px;
   }
 }
+
+input[type='checkbox'] {
+  top: -1px;
+}
 </style>
 
 <template>
@@ -43,7 +47,7 @@
 
         <span class="font-semibold">Tasks</span>
       </div>
-      <pretty-span @click="showCreateTaskModal()" :text="'Add a task'" :icon="'plus'" :classes="'sm:w-fit w-full'" />
+      <pretty-button @click="showCreateTaskModal()" :text="'Add a task'" :icon="'plus'" :classes="'sm:w-fit w-full'" />
     </div>
 
     <!-- add a task modal -->
diff --git a/resources/lang/en/contact.php b/resources/lang/en/contact.php
new file mode 100644
index 000000000..6c101dab0
--- /dev/null
+++ b/resources/lang/en/contact.php
@@ -0,0 +1,15 @@
+<?php
+
+return [
+    'feed_item_author_deleted' => 'Deleted user',
+    'feed_item_contact_information_updated' => 'updated the contact information',
+    'feed_item_important_date_created' => 'added an important date',
+    'feed_item_important_date_updated' => 'updated an important date',
+    'feed_item_important_date_destroyed' => 'deleted an important date',
+    'feed_item_label_assigned' => 'assigned a label',
+    'feed_item_label_removed' => 'removed a label',
+    'feed_item_note_created' => 'wrote a note',
+    'feed_item_note_updated' => 'edited a note',
+    'feed_item_note_destroyed' => 'deleted a note',
+    'feed_item_job_information_updated' => 'updated the job information',
+];
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 45d1293fd..2163aaf25 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -3,6 +3,7 @@
 namespace Tests;
 
 use App\Models\Account;
+use App\Models\Contact;
 use App\Models\User;
 use App\Models\Vault;
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
@@ -63,7 +64,10 @@ abstract class TestCase extends BaseTestCase
      */
     public function setPermissionInVault(User $user, int $permission, Vault $vault): Vault
     {
-        $vault->users()->sync([$user->id => ['permission' => $permission]]);
+        $contact = Contact::factory()->create([
+            'vault_id' => $vault->id,
+        ]);
+        $vault->users()->sync([$user->id => ['permission' => $permission, 'contact_id' => $contact->id]]);
 
         return $vault;
     }
diff --git a/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelperTest.php b/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelperTest.php
index 1d09f988a..2cfa6f8c3 100644
--- a/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageContactFeed/Web/ViewHelpers/ModuleFeedViewHelperTest.php
@@ -37,6 +37,6 @@ class ModuleFeedViewHelperTest extends TestCase
         $this->assertArrayHasKey('items', $array);
         $this->assertArrayHasKey('id', $array['items']->toArray()[0]);
         $this->assertArrayHasKey('action', $array['items']->toArray()[0]);
-        $this->assertArrayHasKey('object', $array['items']->toArray()[0]);
+        $this->assertArrayHasKey('description', $array['items']->toArray()[0]);
     }
 }
diff --git a/tests/Unit/Domains/Contact/ManageNotes/Services/CreateNoteTest.php b/tests/Unit/Domains/Contact/ManageNotes/Services/CreateNoteTest.php
index ff9df01ad..5749071f4 100644
--- a/tests/Unit/Domains/Contact/ManageNotes/Services/CreateNoteTest.php
+++ b/tests/Unit/Domains/Contact/ManageNotes/Services/CreateNoteTest.php
@@ -101,7 +101,6 @@ class CreateNoteTest extends TestCase
             'id' => $note->id,
             'contact_id' => $contact->id,
             'author_id' => $author->id,
-            'author_name' => $author->name,
             'title' => 'super title',
             'body' => 'super body',
         ]);
diff --git a/tests/Unit/Domains/Contact/ManageNotes/Services/DestroyNoteTest.php b/tests/Unit/Domains/Contact/ManageNotes/Services/DestroyNoteTest.php
index 6ce16fee7..0872fbb97 100644
--- a/tests/Unit/Domains/Contact/ManageNotes/Services/DestroyNoteTest.php
+++ b/tests/Unit/Domains/Contact/ManageNotes/Services/DestroyNoteTest.php
@@ -133,11 +133,6 @@ class DestroyNoteTest extends TestCase
             'id' => $note->id,
         ]);
 
-        $this->assertDatabaseMissing('contact_feed_items', [
-            'contact_id' => $contact->id,
-            'feedable_id' => $note->id,
-        ]);
-
         Queue::assertPushed(CreateAuditLog::class, function ($job) {
             return $job->auditLog['action_name'] === 'note_destroyed';
         });
diff --git a/tests/Unit/Domains/Contact/ManageNotes/Web/ViewHelpers/ModuleNotesViewHelperTest.php b/tests/Unit/Domains/Contact/ManageNotes/Web/ViewHelpers/ModuleNotesViewHelperTest.php
index 0fa614ba5..6f5d4cdff 100644
--- a/tests/Unit/Domains/Contact/ManageNotes/Web/ViewHelpers/ModuleNotesViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageNotes/Web/ViewHelpers/ModuleNotesViewHelperTest.php
@@ -80,7 +80,7 @@ class ModuleNotesViewHelperTest extends TestCase
                 'show_full_content' => false,
                 'title' => $note->title,
                 'emotion' => null,
-                'author' => $note->author->name,
+                'author' => null,
                 'written_at' => 'Jan 01, 2018',
                 'url' => [
                     'update' => env('APP_URL').'/vaults/'.$contact->vault->id.'/contacts/'.$contact->id.'/notes/'.$note->id,
diff --git a/tests/Unit/Domains/Contact/ManageNotes/Web/ViewHelpers/NotesIndexViewHelperTest.php b/tests/Unit/Domains/Contact/ManageNotes/Web/ViewHelpers/NotesIndexViewHelperTest.php
index 981e3dadc..9f7aada55 100644
--- a/tests/Unit/Domains/Contact/ManageNotes/Web/ViewHelpers/NotesIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Contact/ManageNotes/Web/ViewHelpers/NotesIndexViewHelperTest.php
@@ -91,7 +91,7 @@ class NotesIndexViewHelperTest extends TestCase
                 'show_full_content' => false,
                 'title' => $note->title,
                 'emotion' => null,
-                'author' => $note->author->name,
+                'author' => null,
                 'written_at' => 'Jan 01, 2018',
                 'url' => [
                     'update' => env('APP_URL').'/vaults/'.$contact->vault->id.'/contacts/'.$contact->id.'/notes/'.$note->id,
diff --git a/tests/Unit/Domains/Settings/ManageUsers/Services/DestroyUserTest.php b/tests/Unit/Domains/Settings/ManageUsers/Services/DestroyUserTest.php
index a9bc4c2a3..3b9eaafbe 100644
--- a/tests/Unit/Domains/Settings/ManageUsers/Services/DestroyUserTest.php
+++ b/tests/Unit/Domains/Settings/ManageUsers/Services/DestroyUserTest.php
@@ -5,6 +5,7 @@ namespace Tests\Unit\Domains\Settings\ManageUsers\Services;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Jobs\CreateAuditLog;
 use App\Models\Account;
+use App\Models\Contact;
 use App\Models\User;
 use App\Models\Vault;
 use App\Settings\ManageUsers\Services\DestroyUser;
@@ -35,24 +36,29 @@ class DestroyUserTest extends TestCase
         ]);
         $vaultManager->users()->save($user, [
             'permission' => Vault::PERMISSION_MANAGE,
+            'contact_id' => Contact::factory()->create()->id,
         ]);
         $vaultEditor = Vault::factory()->create([
             'account_id' => $author->account_id,
         ]);
         $vaultEditor->users()->save($user, [
             'permission' => Vault::PERMISSION_EDIT,
+            'contact_id' => Contact::factory()->create()->id,
         ]);
         $vaultEditor->users()->save(User::factory()->create(), [
             'permission' => Vault::PERMISSION_MANAGE,
+            'contact_id' => Contact::factory()->create()->id,
         ]);
         $vaultViewer = Vault::factory()->create([
             'account_id' => $author->account_id,
         ]);
         $vaultViewer->users()->save($user, [
             'permission' => Vault::PERMISSION_VIEW,
+            'contact_id' => Contact::factory()->create()->id,
         ]);
         $vaultViewer->users()->save(User::factory()->create(), [
             'permission' => Vault::PERMISSION_MANAGE,
+            'contact_id' => Contact::factory()->create()->id,
         ]);
 
         $this->executeService($author->account, $author, $user, $vaultManager, $vaultEditor, $vaultViewer);
diff --git a/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultIndexViewHelperTest.php b/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultIndexViewHelperTest.php
index f74951076..fb443f4a1 100644
--- a/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Vault/ManageVault/Web/ViewHelpers/VaultIndexViewHelperTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVault\Web\ViewHelpers;
 
+use App\Models\Contact;
 use App\Models\User;
 use App\Models\Vault;
 use App\Vault\ManageVault\Web\ViewHelpers\VaultIndexViewHelper;
@@ -20,6 +21,7 @@ class VaultIndexViewHelperTest extends TestCase
         $vault = Vault::factory()->create();
         $user->vaults()->attach($vault->id, [
             'permission' => Vault::PERMISSION_EDIT,
+            'contact_id' => Contact::factory()->create()->id,
         ]);
 
         $this->be($user);
@@ -69,7 +71,10 @@ class VaultIndexViewHelperTest extends TestCase
         $vault = Vault::factory()->create([
             'account_id' => $user->account_id,
         ]);
-        $user->vaults()->sync([$vault->id => ['permission' => Vault::PERMISSION_MANAGE]]);
+        $user->vaults()->sync([$vault->id => [
+            'permission' => Vault::PERMISSION_MANAGE,
+            'contact_id' => Contact::factory()->create()->id,
+        ]]);
 
         $array = VaultIndexViewHelper::data($user);
 
diff --git a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/ChangeVaultAccessTest.php b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/ChangeVaultAccessTest.php
index fced380e6..ef00c869c 100644
--- a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/ChangeVaultAccessTest.php
+++ b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/ChangeVaultAccessTest.php
@@ -5,6 +5,7 @@ namespace Tests\Unit\Domains\Vault\ManageVaultSettings\Services;
 use App\Exceptions\NotEnoughPermissionException;
 use App\Jobs\CreateAuditLog;
 use App\Models\Account;
+use App\Models\Contact;
 use App\Models\User;
 use App\Models\Vault;
 use App\Vault\ManageVaultSettings\Services\ChangeVaultAccess;
@@ -29,6 +30,7 @@ class ChangeVaultAccessTest extends TestCase
         $vault = $this->setPermissionInVault($regis, Vault::PERMISSION_MANAGE, $vault);
         $vault->users()->save($anotherUser, [
             'permission' => Vault::PERMISSION_MANAGE,
+            'contact_id' => Contact::factory()->create()->id,
         ]);
         $this->executeService($regis->account, $regis, $anotherUser, $vault);
     }
diff --git a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/GrantVaultAccessToUserTest.php b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/GrantVaultAccessToUserTest.php
index 205462af8..0adee2a1e 100644
--- a/tests/Unit/Domains/Vault/ManageVaultSettings/Services/GrantVaultAccessToUserTest.php
+++ b/tests/Unit/Domains/Vault/ManageVaultSettings/Services/GrantVaultAccessToUserTest.php
@@ -131,7 +131,7 @@ class GrantVaultAccessToUserTest extends TestCase
 
         $user = (new GrantVaultAccessToUser)->execute($request);
 
-        $this->assertDatabaseCount('contacts', 2);
+        $this->assertDatabaseCount('contacts', 3);
 
         $contact = Contact::where('first_name', $anotherUser->first_name)->first();
 
diff --git a/tests/Unit/Domains/Vault/ManageVaultSettings/Web/ViewHelpers/VaultSettingsIndexViewHelperTest.php b/tests/Unit/Domains/Vault/ManageVaultSettings/Web/ViewHelpers/VaultSettingsIndexViewHelperTest.php
index cb9b67ee9..ca8ce30c9 100644
--- a/tests/Unit/Domains/Vault/ManageVaultSettings/Web/ViewHelpers/VaultSettingsIndexViewHelperTest.php
+++ b/tests/Unit/Domains/Vault/ManageVaultSettings/Web/ViewHelpers/VaultSettingsIndexViewHelperTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Unit\Domains\Vault\ManageVaultSettings\Web\ViewHelpers;
 
+use App\Models\Contact;
 use App\Models\Label;
 use App\Models\Template;
 use App\Models\User;
@@ -28,7 +29,7 @@ class VaultSettingsIndexViewHelperTest extends TestCase
         $vault = Vault::factory()->create([
             'account_id' => $template->account_id,
         ]);
-        $vault->users()->sync([$userInVault->id => ['permission' => 100]]);
+        $vault->users()->sync([$userInVault->id => ['permission' => 100, 'contact_id' => Contact::factory()->create()->id]]);
 
         $array = VaultSettingsIndexViewHelper::data($vault);
         $this->assertCount(
diff --git a/tests/Unit/Helpers/UserHelperTest.php b/tests/Unit/Helpers/UserHelperTest.php
new file mode 100644
index 000000000..2d7e4d6b8
--- /dev/null
+++ b/tests/Unit/Helpers/UserHelperTest.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Tests\Unit\Helpers;
+
+use App\Helpers\AvatarHelper;
+use App\Helpers\UserHelper;
+use App\Models\Avatar;
+use App\Models\Contact;
+use App\Models\User;
+use App\Models\Vault;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Tests\TestCase;
+
+class UserHelperTest extends TestCase
+{
+    use DatabaseTransactions;
+
+    /** @test */
+    public function it_returns_the_information_about_the_contact_of_the_user_in_the_vault(): void
+    {
+        $rachel = User::factory()->create();
+        $vault = Vault::factory()->create([
+            'account_id' => $rachel->account_id,
+        ]);
+        $contact = Contact::factory()->create([
+            'vault_id' => $vault->id,
+            'first_name' => 'Keanu',
+            'last_name' => 'Reeves',
+        ]);
+        $avatar = Avatar::factory()->create([
+            'contact_id' => $contact->id,
+        ]);
+        $contact->avatar_id = $avatar->id;
+        $contact->save();
+        $vault->users()->save($rachel, [
+            'permission' => 1,
+            'contact_id' => $contact->id,
+        ]);
+
+        $this->assertEquals(
+            [
+                'id' => $contact->id,
+                'name' => 'Keanu Reeves',
+                'avatar' => AvatarHelper::getSVG($contact),
+            ],
+            UserHelper::getInformationAboutContact($rachel, $vault)
+        );
+    }
+
+    /** @test */
+    public function it_returns_null_if_the_user_doesnt_have_a_contact_in_the_vault(): void
+    {
+        $rachel = User::factory()->create();
+        $vault = Vault::factory()->create([
+            'account_id' => $rachel->account_id,
+        ]);
+
+        $this->assertNull(
+            UserHelper::getInformationAboutContact($rachel, $vault)
+        );
+    }
+}
diff --git a/tests/Unit/Helpers/VaultHelperTest.php b/tests/Unit/Helpers/VaultHelperTest.php
index ba8669419..437b2b989 100644
--- a/tests/Unit/Helpers/VaultHelperTest.php
+++ b/tests/Unit/Helpers/VaultHelperTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Unit\Helpers;
 
 use App\Helpers\VaultHelper;
+use App\Models\Contact;
 use App\Models\User;
 use App\Models\Vault;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
@@ -38,6 +39,7 @@ class VaultHelperTest extends TestCase
         $vault = Vault::factory()->create();
         $user->vaults()->attach($vault->id, [
             'permission' => Vault::PERMISSION_VIEW,
+            'contact_id' => Contact::factory()->create()->id,
         ]);
 
         $this->assertEquals(
diff --git a/tests/Unit/Models/ContactFeedItemTest.php b/tests/Unit/Models/ContactFeedItemTest.php
index 0eac67973..aefd47d8e 100644
--- a/tests/Unit/Models/ContactFeedItemTest.php
+++ b/tests/Unit/Models/ContactFeedItemTest.php
@@ -10,6 +10,14 @@ class ContactFeedItemTest extends TestCase
 {
     use DatabaseTransactions;
 
+    /** @test */
+    public function it_has_one_user()
+    {
+        $feedItem = ContactFeedItem::factory()->create();
+
+        $this->assertTrue($feedItem->author()->exists());
+    }
+
     /** @test */
     public function it_has_one_contact()
     {
diff --git a/tests/Unit/Models/UserTest.php b/tests/Unit/Models/UserTest.php
index 4a9a7cf8a..cdd7fa745 100644
--- a/tests/Unit/Models/UserTest.php
+++ b/tests/Unit/Models/UserTest.php
@@ -31,7 +31,10 @@ class UserTest extends TestCase
             'account_id' => $regis->account_id,
         ]);
 
-        $regis->vaults()->sync([$vault->id => ['permission' => Vault::PERMISSION_MANAGE]]);
+        $regis->vaults()->sync([$vault->id => [
+            'permission' => Vault::PERMISSION_MANAGE,
+            'contact_id' => Contact::factory()->create()->id,
+        ]]);
 
         $this->assertTrue($regis->vaults()->exists());
     }
@@ -105,5 +108,10 @@ class UserTest extends TestCase
             $contact->id,
             $rachel->getContactInVault($vault)->id,
         );
+
+        $robert = User::factory()->create();
+        $this->assertNull(
+            $robert->getContactInVault($vault),
+        );
     }
 }
diff --git a/tests/Unit/Models/VaultTest.php b/tests/Unit/Models/VaultTest.php
index 0aa48f8cb..e8579bef2 100644
--- a/tests/Unit/Models/VaultTest.php
+++ b/tests/Unit/Models/VaultTest.php
@@ -42,7 +42,10 @@ class VaultTest extends TestCase
             'account_id' => $dwight->account_id,
         ]);
 
-        $vault->users()->sync([$dwight->id => ['permission' => Vault::PERMISSION_MANAGE]]);
+        $vault->users()->sync([$dwight->id => [
+            'permission' => Vault::PERMISSION_MANAGE,
+            'contact_id' => Contact::factory()->create()->id,
+        ]]);
 
         $this->assertTrue($vault->users()->exists());
     }