diff --git a/templates/basebase.html b/templates/basebase.html
index deca65f2..2a97d27c 100644
--- a/templates/basebase.html
+++ b/templates/basebase.html
@@ -117,7 +117,11 @@
 	    <div class="grid_1 tooltip">
 	      {% if user.is_authenticated %}
 	      <p>
+                {% if user.first_name %}
 	        <a class="button gray small" href="/rowers/me/edit">{{ user.first_name }}</a>
+                {% else %}
+                <a class="button gray small" href="/rowers/me/edit">{{ user }}</a>
+                {% endif %}
 	      </p>
 	      <span class="tooltiptext">Edit user account, e.g. heart rate zones, power zones, email, teams</span>