diff --git a/src/View/Account.elm b/src/View/Account.elm
index 3afc116..29edd77 100644
--- a/src/View/Account.elm
+++ b/src/View/Account.elm
@@ -258,7 +258,7 @@ accountView subView currentUser accountInfo =
                                 , muteButton currentUser accountInfo.relationship account
                                 , blockButton currentUser accountInfo.relationship account
                                 , Common.accountAvatarLink True account
-                                , span [ class "account-display-name" ] [ text account.display_name ]
+                                , span [ class "account-display-name" ] [ text (if account.display_name=="" then account.username else account.display_name) ]
                                 , span [ class "account-username" ]
                                     [ Common.accountLink True account
                                     , case accountInfo.relationship of
diff --git a/src/View/Status.elm b/src/View/Status.elm
index 8ef0eca..8365a4d 100644
--- a/src/View/Status.elm
+++ b/src/View/Status.elm
@@ -222,7 +222,7 @@ statusView context ({ account, content, media_attachments, reblog, mentions } as
                     [ Common.accountAvatarLink False account
                     , div [ class "username" ]
                         [ a accountLinkAttributes
-                            [ text account.display_name
+                            [ text (if account.display_name=="" then account.username else account.display_name)
                             , span [ class "acct" ] [ text <| " @" ++ account.username ]
                             ]
                         ]