diff --git a/routes/settings/instances/[instanceName].html b/routes/settings/instances/[instanceName].html
index cb13ea94..965d3acd 100644
--- a/routes/settings/instances/[instanceName].html
+++ b/routes/settings/instances/[instanceName].html
@@ -14,7 +14,7 @@
                       href="{{verifyCredentials.url}}">
           {{'@' + verifyCredentials.acct}}
         </ExternalLink>
-        <span class="acct-display-name">{{verifyCredentials.display_name}}</span>
+        <span class="acct-display-name">{{verifyCredentials.display_name || verifyCredentials.acct}}</span>
       </div>
       <h2>Theme:</h2>
       <form class="theme-chooser" aria-label="Choose a theme">
diff --git a/tests/spec/02-login-spec.js b/tests/spec/02-login-spec.js
index 978a2733..2f630be6 100644
--- a/tests/spec/02-login-spec.js
+++ b/tests/spec/02-login-spec.js
@@ -43,6 +43,9 @@ test('Logs out', async t => {
     .click($('a').withText('Instances'))
     .click($('a').withText('localhost:3000'))
     .expect(getUrl()).contains('/settings/instances/localhost:3000')
+    .expect($('.instance-name-h1').innerText).eql('localhost:3000')
+    .expect($('.acct-handle').innerText).eql('@foobar')
+    .expect($('.acct-display-name').innerText).eql('foobar')
     .click($('button').withText('Log out'))
     .click($('#modal-dialog button').withText('OK'))
     .expect($('.container').innerText)