diff --git a/app/assets/javascripts/discourse/app/components/user-profile-avatar.hbs b/app/assets/javascripts/discourse/app/components/user-profile-avatar.hbs
index 7c88f0d1e01..5d86e1763fc 100644
--- a/app/assets/javascripts/discourse/app/components/user-profile-avatar.hbs
+++ b/app/assets/javascripts/discourse/app/components/user-profile-avatar.hbs
@@ -1,11 +1,21 @@
-<div class="user-profile-avatar">
-  {{bound-avatar @user "huge"}}
-  <UserAvatarFlair @user={{@user}} />
-  <div>
+<PluginOutlet
+  @name="user-profile-avatar-wrapper"
+  @outletArgs={{hash user=@user}}
+>
+  <div class="user-profile-avatar">
     <PluginOutlet
-      @name="user-profile-avatar-flair"
-      @connectorTagName="div"
-      @outletArgs={{hash model=@user}}
-    />
+      @name="user-profile-avatar-img-wrapper"
+      @outletArgs={{hash user=@user}}
+    >
+      {{bound-avatar @user "huge"}}
+    </PluginOutlet>
+
+    <UserAvatarFlair @user={{@user}} />
+    <div>
+      <PluginOutlet
+        @name="user-profile-avatar-flair"
+        @outletArgs={{hash model=@user}}
+      />
+    </div>
   </div>
-</div>
\ No newline at end of file
+</PluginOutlet>
\ No newline at end of file