diff --git a/files/classes/badges.py b/files/classes/badges.py
index 3be59fa9c..c751247d5 100644
--- a/files/classes/badges.py
+++ b/files/classes/badges.py
@@ -50,15 +50,9 @@ class Badge(Base):
 
 	@property
 	@lazy
-	def json_core(self):
-
+	def json(self):
 		return {'text': self.text,
 				'name': self.name,
 				'url': self.url,
 				'icon_url':f"https://{app.config['SERVER_NAME']}{self.path}"
-				}
-
-	@property
-	@lazy
-	def json(self):
-		return self.json_core
+				}
\ No newline at end of file
diff --git a/files/classes/user.py b/files/classes/user.py
index c8c6b26e1..645dbce37 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -434,6 +434,7 @@ class User(Base):
 				'coins': self.coins,
 				'post_count': self.post_count,
 				'comment_count': self.comment_count,
+				'badges': [x.path for x in self.badges],
 				}
 
 		return data
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 6074a4a1d..3e320bbac 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -40,7 +40,7 @@
 			<span class="pop-bio popover-bio text-black"></span>
 		</div>
 
-		<div class="ml-3 mr-3 my-2">
+		<div class="pop-badges ml-3 mr-3 my-2">
 		</div>
 
 	  <div class="border-top d-flex align-items-center p-3 gap-3 smol">
@@ -758,7 +758,7 @@
 
 {% include "expanded_image_modal.html" %}
 
-<script src="/assets/js/comments+submission_listing.js?v=100"></script>
+<script src="/assets/js/comments+submission_listing.js?v=105"></script>
 <script src="/assets/js/comments.js?v=14"></script>
 
 <script>
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 4754ace75..ed7a24ae5 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -28,7 +28,7 @@
 			<span class="pop-bio popover-bio text-black"></span>
 		</div>
 
-		<div class="ml-3 mr-3 my-2">
+		<div class="pop-badges ml-3 mr-3 my-2">
 		</div>
 
 	  <div class="border-top d-flex align-items-center p-3 gap-3 smol">
@@ -654,5 +654,5 @@
 </style>
 
 <script src="/assets/js/clipboard.js?v=3"></script>
-<script src="/assets/js/comments+submission_listing.js?v=100"></script>
+<script src="/assets/js/comments+submission_listing.js?v=105"></script>
 <script src="/assets/js/submission_listing.js?v=10"></script>
\ No newline at end of file