diff --git a/templates/header.html b/templates/header.html
index b77045a2..7b3a4c02 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -122,14 +122,17 @@
{% endif %}
-
- {{ current_user.name }}
+
+ {{ current_user.name or current_user.email }}
{% if current_user.in_trial() %}
- Premium expires {{ current_user.trial_end|dt }}
-
+
+ Premium expires {{ current_user.trial_end|dt }}
+
{% elif current_user.is_premium() %}