diff --git a/Changes b/Changes
index 08ead5aa..149e2d99 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,9 @@
+2.038032 - 2018-01-28
+
+  [ENHANCEMENTS]
+
+  * #363 Show user fullname if available in navbar (earendilfr)
+
 2.038031 - 2018-01-23
 
   [ENHANCEMENTS]
diff --git a/lib/App/Netdisco/Web/AuthN.pm b/lib/App/Netdisco/Web/AuthN.pm
index 9e91e114..72f3155f 100644
--- a/lib/App/Netdisco/Web/AuthN.pm
+++ b/lib/App/Netdisco/Web/AuthN.pm
@@ -57,7 +57,11 @@ post '/login' => sub {
     );
 
     if ($success) {
+        my $user = schema('netdisco')->resultset('User')
+          ->find( param('username') );
+
         session logged_in_user => param('username');
+        session logged_in_fullname => $user->fullname;
         session logged_in_user_realm => $realm;
 
         schema('netdisco')->resultset('UserLog')->create({
@@ -67,9 +71,7 @@ post '/login' => sub {
           details => param('return_url'),
         });
 
-        schema('netdisco')->resultset('User')
-          ->find( session('logged_in_user') )
-          ->update({ last_on => \'now()' });
+        $user->update({ last_on => \'now()' });
 
         return if request->is_ajax;
         redirect param('return_url');
diff --git a/share/views/layouts/main.tt b/share/views/layouts/main.tt
index 7ccd2940..47771ed2 100644
--- a/share/views/layouts/main.tt
+++ b/share/views/layouts/main.tt
@@ -174,7 +174,7 @@
           [% ELSE %]
             <i class="icon-user"></i>
           [% END %]&nbsp;
-            [% session.logged_in_user | html_entity %] <b class="caret"></b>
+            [% session.logged_in_fullname || session.logged_in_user | html_entity %] <b class="caret"></b>
           </a>
           <ul class="dropdown-menu">
           [% IF NOT user_has_role('ldap') %]