diff --git a/templates/main/topbar.html b/templates/main/topbar.html
index 4dd5e50..416f441 100644
--- a/templates/main/topbar.html
+++ b/templates/main/topbar.html
@@ -109,9 +109,18 @@
         </ul>
       </div>
 
-      <!-- User Greeting -->
-      <span class="navbar-text">Hello, {{ .User.Username }}</span>
-      <a class="btn btn-outline-danger btn-xs" href="/account/logout">Logout</a>
+      <!-- User Greeting/Dropdown -->
+      <div class="dropdown">
+        <a class="nav-link dropdown-toggle text-dark" href="#" id="userDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+          Hello, {{ .User.Username }}
+        </a>
+        <ul class="dropdown-menu dropdown-menu-end shadow-sm" aria-labelledby="userDropdown">
+          <li><a class="dropdown-item" href="/account/profile">Update Profile</a></li>
+          <li><a class="dropdown-item" href="/account/password">Change Password</a></li>
+          <li><hr class="dropdown-divider"></li>
+          <li><a class="dropdown-item text-danger" href="/logout">Logout</a></li>
+        </ul>
+      </div>
     {{ else }}
       <a class="btn btn-outline-primary btn-sm" href="/account/login">Login</a>
     {{ end }}