diff --git a/templates/leaderboard.html b/templates/leaderboard.html
index 3f81334..cf02f07 100644
--- a/templates/leaderboard.html
+++ b/templates/leaderboard.html
@@ -38,11 +38,13 @@
                     {% for index, user in enumerate(leaderboard, start=1) %}
                     <tr>
                         <td>{{ index }}</td>
-                        <td><img src="{{ user.profile_picture }}" alt="Profile Picture" class="profile-picture"></td>
-                        <td>{{ user.nickname }}</td>
+                        <td>
+                            <img src="{{ user.profile_picture or '/static/default_profile.png' }}" alt="Profile Picture" class="profile-picture">
+                        </td>
+                        <td>{{ user.nickname or 'Unknown User' }}</td>
                         <td>{{ user.level }}</td>
                         <td>{{ user.xp }}</td>
-                        <td>{{ user.join_date }}</td>
+                        <td>{{ user.join_date or 'N/A' }}</td>
                     </tr>
                     {% endfor %}
                 </tbody>