diff --git a/lib/App/Netdisco/Web.pm b/lib/App/Netdisco/Web.pm
index 6d761283..13f04bd1 100644
--- a/lib/App/Netdisco/Web.pm
+++ b/lib/App/Netdisco/Web.pm
@@ -247,7 +247,7 @@ hook after_error_render => sub { setting('layout' => 'main') };
                                tag => $_->{'tag'},
                                path => config->{'url_base'}->with("/t/$_->{tag}")->path } ) }
             @{ setting('tenant_databases') },
-            { tag => 'netdisco', displayname => 'Default' }
+            { tag => 'netdisco', displayname => (setting('database')->{displayname} || 'Default') }
     });
     config->{'tenant_data'}->{'netdisco'}->{'path'}
       = URI::Based->new((config->{path} eq '/') ? '' : config->{path})->path;
diff --git a/share/views/layouts/main.tt b/share/views/layouts/main.tt
index f124dfb8..86ddb13f 100644
--- a/share/views/layouts/main.tt
+++ b/share/views/layouts/main.tt
@@ -176,7 +176,7 @@
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">
             <i class="icon-home text-success"></i>
-            &nbsp;[% settings.tenant_data.$tenant.displayname || 'Default' | html_entity %]
+            &nbsp;[% (settings.tenant_data.$tenant.displayname || settings.database.displayname || 'Default') | html_entity %]
             <b class="caret"></b>
           </a>
           <ul class="dropdown-menu">