diff --git a/templates/base.html b/templates/base.html
index 77f4e9a..66eb8c1 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -45,7 +45,15 @@
             </ul>
             <ul class="navbar-nav">
                 {% if user.is_authenticated %}
-                    <li class="nav-item"><a class="nav-link" href="#">{{ user.username }}</a></li>
+                    <li class="nav-item"><a class="nav-link" href="#">
+                        {% if user.first_name and user.last_name %}
+                            {{ user.first_name }} {{ user.last_name }}
+                        {% elif user.username %}
+                            {{ user.username }}
+                        {% else %}
+                            {{ user.email }}
+                        {% endif %}
+                        </a></li>
                     <li class="nav-item"><a class="nav-link text-danger" href="{% url 'accounts:logout' %}">Logout</a></li>
                 {% else %}
                     <li class="nav-item"><a class="nav-link" href="{% url 'accounts:login' %}">Login</a></li>