diff --git a/app/Livewire/App/Pfp.php b/app/Livewire/App/Pfp.php
index e5f6fbd..264bad4 100644
--- a/app/Livewire/App/Pfp.php
+++ b/app/Livewire/App/Pfp.php
@@ -7,16 +7,12 @@ use Livewire\Component;
 
 class Pfp extends Component
 {
-	public string $user = '';
+	public User $user;
 	public string $size = '3rem';
 	public string $shape = 'circle';
 
     public function render()
     {
-		$u = User::find($this->user);
-        return view('livewire.app.pfp', [
-			'pfp' => $u->getAvatarBase64(),
-			'name' => $u->name,
-		]);
+        return view('livewire.app.pfp');
     }
 }
diff --git a/resources/views/livewire/app/navbar.blade.php b/resources/views/livewire/app/navbar.blade.php
index 81ad235..e24b0c4 100644
--- a/resources/views/livewire/app/navbar.blade.php
+++ b/resources/views/livewire/app/navbar.blade.php
@@ -36,7 +36,10 @@
 
 		@auth
 			<wa-button href="{{ url('/profiles/' . Auth::id()) }}" appearance="plain" wire:navigate.hover>
-				{{ Auth::user()->name }}
+				<div class="wa-cluster wa-align-items-center">
+					<livewire:app.pfp :user="auth()->user()" size="2rem" shape="rounded" />
+					{{ Auth::user()->name }}
+				</div>
 			</wa-button>
 			<wa-icon-button href="{{ route('logout') }}" appearance="plain" name="arrow-left-from-bracket"></wa-icon-button>
 		@endauth
diff --git a/resources/views/livewire/app/pfp.blade.php b/resources/views/livewire/app/pfp.blade.php
index e0f1867..5ab3356 100644
--- a/resources/views/livewire/app/pfp.blade.php
+++ b/resources/views/livewire/app/pfp.blade.php
@@ -1,3 +1,8 @@
 <div>
-	<wa-avatar image="{{ $pfp }}" label="{{ $name }}'s Profile Picture" shape="{{ $shape }}" loading="lazy" style="--size: {{ $size }}"></wa-avatar>
+	<wa-avatar
+		image="{{ $user->getAvatarBase64() }}"
+		label="avatar for {{ $user->name }}"
+		shape="{{ $shape }}"
+		style="--size: {{ $size }}"
+	></wa-avatar>
 </div>
diff --git a/resources/views/livewire/pages/profile.blade.php b/resources/views/livewire/pages/profile.blade.php
index 146d81a..140c864 100644
--- a/resources/views/livewire/pages/profile.blade.php
+++ b/resources/views/livewire/pages/profile.blade.php
@@ -1,7 +1,7 @@
 <div class="wa-stack wa-gap-3xl">
 	<div class="wa-stack">
 		<div class="wa-flank wa-align-items-center">
-			<livewire:app.pfp user="{{ $user->id }}" size="5rem" shape="rounded" />
+			<livewire:app.pfp :$user size="5rem" shape="rounded" />
 			<h1>{{ $user->name }}</h1>
 		</div>
 
diff --git a/resources/views/livewire/posts/comment.blade.php b/resources/views/livewire/posts/comment.blade.php
index 9a9c98d..add2621 100644
--- a/resources/views/livewire/posts/comment.blade.php
+++ b/resources/views/livewire/posts/comment.blade.php
@@ -1,5 +1,5 @@
 <div class="wa-flank wa-align-items-center">
-	<livewire:app.pfp :user="$comment->user->id" />
+	<livewire:app.pfp :user="$comment->user" />
 	<div class="wa-split">
 		<div class="wa-stack wa-gap-3xs">
 			<div class="wa-cluster wa-align-items-center">