diff --git a/views/app/avatar.html b/views/app/avatar.html
index 50efce61b2..a823400e99 100644
--- a/views/app/avatar.html
+++ b/views/app/avatar.html
@@ -11,9 +11,9 @@
                 data-name="{username(@profile.auth, @profile.profile.name)}"
                 data-level="{@profile.stats.lvl}"
                 data-checkpet="{#if @profile.items.pet}hasPet{/}"
-                data-checkuser="{{#if equal(@profile.id, _user.id)}}isUser{{/}}"
+                data-checkuser="{{#if @main}}isUser{{/}}"
                 data-uid="{{@profile.id}}" x-bind="click:profileChangeActive"
-                rel="popover" data-placement="bottom" data-trigger="hover" data-html="true" data-content="
+                rel="popover" data-placement="bottom" data-trigger="hover" data-html="true" data-content="{{#unless @main}}
                              <div>
                                 <div class='progress progress-danger' style='height:5px;'>
                                     <div class='bar' style='height: 5px; width: {percent(@profile.stats.hp, 50)}%;'></div>
@@ -25,7 +25,7 @@
                                 <div>GP: {floor(@profile.stats.gp)}</div>
                                 <div>{count(@profile.items.pets)} / 90 Pets Found</div>
                             </div>
-                        ">
+                        {{/}}">
         <div class='character-sprites'>
             {#with @profile.preferences as :p}
                 <span class='{:p.gender}_skin_{:p.skin}'></span>
diff --git a/views/app/header.html b/views/app/header.html
index 45a965dccc..43c9834b3e 100644
--- a/views/app/header.html
+++ b/views/app/header.html
@@ -3,7 +3,7 @@
         <header class="site-header" role="banner" data-partySize="{#if gt(_partyMembers.length,1)}{truarr(_partyMembers.length)}{else}0{/}">
             <!-- avatar -->
             <div class="herobox-wrap main-herobox">
-                <app:avatar:avatar profile={_user}>
+                <app:avatar:avatar profile={_user} main=true>
             </div>
 
             <!-- stat bars -->