diff --git a/files/templates/comments.html b/files/templates/comments.html
index 222d10884..c314a22e4 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -8,7 +8,6 @@
 	<script defer src="/assets/js/comments_admin.js?v=56"></script>
 {% endif %}
 
-<script defer src="/assets/js/popover.js?v=17"></script>
 <script defer src="/assets/js/comments.js?v=32"></script>
 
 {% include "expanded_image_modal.html" %}
diff --git a/files/templates/default.html b/files/templates/default.html
index c4f6c00dd..9bdacb8c7 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -337,6 +337,8 @@
 <script src="/assets/js/gif_modal.js?v=56"></script>
 <script src="/assets/js/emoji_modal.js?v=142"></script>
 
+<script defer src="/assets/js/popover.js?v=18"></script>
+
 <script src="/assets/js/mobile_navigation_bar.js?v=111"></script>
 
 {% if v %}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index be1359ad4..871d60ea6 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -356,7 +356,7 @@
 						<i class="fas fa-badge-check align-middle ml-1" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="" data-bs-original-title="{{p.author.verified}}"></i>
 						{% endif %}
 						</span>
-						<a class="user-name" data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="focus" data-content-id="popover-{{p.id}}" href="javascript:void(0)" tabindex="0" style="color: #{{p.author.namecolor}}" data-bs-original-title="" title="">
+						<a class="user-name" onclick="userPopover({{p.author.json_popover | tojson}})" data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="focus" data-content-id="popover-{{p.id}}" href="javascript:void(0)" tabindex="0" style="color: #{{p.author.namecolor}}" data-bs-original-title="" title="">
 							<span class="inline-flex flex-shrink-0 items-center font-bold">
 								{% if p.author.patron and not p.distinguish_level %}
 								<span class="patron" style="background-color:#{{p.author.namecolor}};">