diff --git a/assets/mastodon.css b/assets/mastodon.css
index 7b014c3..6bcdc95 100644
--- a/assets/mastodon.css
+++ b/assets/mastodon.css
@@ -95,10 +95,11 @@
 .account__header__tabs__name {
     padding: 5px;
 }
-.account__header__tabs__name h1 {
+.account__header__bar .account__header__tabs__name h1 {
     font-size: 16px;
     line-height: 24px;
     color: #000;
+    font-family: inherit;
     font-weight: 500;
     margin: 0;
     overflow: hidden;
@@ -124,6 +125,9 @@
     padding: 20px 15px 5px;
     color: #000;
 }
+.account__header__bio .account__header__content p {
+    font-family: inherit;
+}
 .account__header__content {
     color: #282c37;
     font-size: 14px;
diff --git a/fediembedi.php b/fediembedi.php
index 73325f2..8d92cc6 100644
--- a/fediembedi.php
+++ b/fediembedi.php
@@ -174,7 +174,7 @@ class FediConfig
 
       //getStatus from remote instance
       $status = $client->getStatus($atts['only_media'], $atts['pinned'], $atts['exclude_replies'], null, null, null, $atts['limit'], $atts['exclude_reblogs']);
-      //if(WP_DEBUG_DISPLAY === true): echo '<details><summary>Mastodon</summary><pre>'; var_dump($client->getStatus($atts)); echo '</pre></details>'; endif;
+      //if(WP_DEBUG_DISPLAY === true): echo '<details><summary>Mastodon</summary><pre>'; var_dump($client->getStatus($atts['only_media'], $atts['pinned'], $atts['exclude_replies'], null, null, null, $atts['limit'], $atts['exclude_reblogs'])); echo '</pre></details>'; endif;
       $show_header = $atts['show_header'];
       $account = $status[0]->account;
       include(plugin_dir_path(__FILE__) . 'templates/mastodon.tpl.php' );
diff --git a/templates/mastodon.tpl.php b/templates/mastodon.tpl.php
index 630dd72..5fde702 100644
--- a/templates/mastodon.tpl.php
+++ b/templates/mastodon.tpl.php
@@ -62,7 +62,16 @@
                     <div class="status__avatar">
                       <div class="account__avatar" style="background-image: url(<?php if(is_null($statut->reblog)): echo $statut->account->avatar; else: echo $statut->reblog->account->avatar; endif; ?>); background-size: 40px; width: 40px; height: 40px;"></div>
                     </div>
-                    <span class="display-name"><?php if(is_null($statut->reblog)): echo apply_filters('fedi_emoji', $statut->account->display_name, $statut->account->emojis); else: echo apply_filters('fedi_emoji', $statut->reblog->account->display_name, $statut->reblog->account->emojis); endif; ?></span>
+                    <span class="display-name"><?php
+                    if(is_null($statut->reblog)):
+                      echo apply_filters('fedi_emoji', $statut->account->display_name, $statut->account->emojis);
+                    else:
+                      if(empty($statut->reblog->account->display_name)):
+                        echo $statut->reblog->account->username;
+                      else:
+                        echo apply_filters('fedi_emoji', $statut->reblog->account->display_name, $statut->reblog->account->emojis);
+                      endif;
+                    endif; ?></span>
                   </a>
                 </div>
                 <div class="status__content"><?php