diff --git a/templates/components/header.html b/templates/components/header.html
index d24bff6..6f8d04c 100644
--- a/templates/components/header.html
+++ b/templates/components/header.html
@@ -24,7 +24,11 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
                         <button class="profile-button btn p-0 border-0 bg-transparent">
-                            {{ render_silhouette() }}
+                            {% if user.avatar_data %}
+                                <img src="{{ url_for('get_avatar') }}" alt="User Avatar" class="d-inline-block align-top" width="30" height="30" style="border-radius: 50%;">
+                            {% else %}
+                                {{ render_silhouette() }}
+                            {% endif %}
                         </button>
                     </a>
                     <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">
diff --git a/templates/users/organization.html b/templates/users/organization.html
index 913598b..f6e7976 100644
--- a/templates/users/organization.html
+++ b/templates/users/organization.html
@@ -63,7 +63,11 @@ <h1 class="mb-4">{{ organization.name }}</h1>
                             {% for user in role.users %}
                             <tr>
                                 <td class="text-center" style="width: 50px;">
-                                    {{ render_silhouette(width=40, height=40) }}
+                                    {% if user.avatar_data %}
+                                        <img src="{{ url_for('get_avatar') }}" alt="User Avatar" class="d-inline-block align-top" width="40" height="40" style="border-radius: 50%;">
+                                    {% else %}
+                                        {{ render_silhouette(width=40, height=40) }}
+                                    {% endif %}
                                 </td>
                                 <td>{{ user.name }}</td>
                                 <td>{{ user.email }}</td>