diff --git a/admin_tools/theming/templates/admin/base.html b/admin_tools/theming/templates/admin/base.html
index 10d4719..d598ee8 100644
--- a/admin_tools/theming/templates/admin/base.html
+++ b/admin_tools/theming/templates/admin/base.html
@@ -29,7 +29,7 @@
         {% if user.is_active and user.is_staff %}
         <div id="user-tools">
             {% trans 'Welcome,' %}
-            <strong>{% filter force_escape %}{% firstof user.first_name user.username %}{% endfilter %}</strong>.
+            <strong>{% filter force_escape %}{% firstof user.get_short_name user.first_name user.get_username user.username %}{% endfilter %}</strong>.
             {% block userlinks %}
                 {% url 'django-admindocs-docroot' as docsroot %}
                 {% if docsroot %}