diff --git a/apps/main/templates/base.html b/apps/main/templates/base.html
index c132f93408..b7a41055aa 100755
--- a/apps/main/templates/base.html
+++ b/apps/main/templates/base.html
@@ -27,8 +27,10 @@
         {% if user.is_anonymous %}
             {% trans 'Anonymous' %}
         {% else %}
-            {{ user }}
-            <a href="{% url password_change_view %}">({% trans 'New password' %})</a>
+            {{ user.full_name|default:user }}
+            {% if has_usable_password %}
+                <a href="{% url password_change_view %}">({% trans 'New password' %})</a>
+            {% endif %}
         {% endif %}
     </li>
     {% if user.is_staff %}