diff --git a/files/templates/comments.html b/files/templates/comments.html
index bf4d9e5c6..2c2c5beb0 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -187,7 +187,7 @@
 								{% if c.author.verified %}<i class="fas fa-badge-check align-middle ml-1 {% if c.author.verified=='Glowiefied' %}glow{% endif %}" style="color:{% if c.author.verifiedcolor %}#{{c.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{c.author.verified}}"></i>
 								{% endif %}
 
-								<a class="user-name text-decoration-none unbreakable" href="{{c.author.url}}" data-pop-info='{{c.author.json_popover(v) | tojson}}'' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="manual" data-content-id="popover" tabindex="0" style="color:#{{c.author.name_color}}; font-size:12px; font-weight:bold">
+								<a class="user-name text-decoration-none" href="{{c.author.url}}" data-pop-info='{{c.author.json_popover(v) | tojson}}'' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="manual" data-content-id="popover" tabindex="0" style="color:#{{c.author.name_color}}; font-size:12px; font-weight:bold">
 									<div class="profile-pic-30-wrapper">
 										<img loading="lazy" alt="@{{c.author.username}}'s profile picture" src="{{c.author.profile_url}}" class="profile-pic-30 mr-2">
 										{% if c.author.hat_active(v)[0] -%}
@@ -211,7 +211,7 @@
 									{%- else -%}
 										#comment-{{c.parent_comment_id}}-only
 									{%- endif -%}
-								" class="text-muted ml-2 unbreakable">
+								" class="text-muted ml-2">
 									<i class="fas fa-reply fa-sm fa-fw fa-flip-horizontal"></i>
 									{{c.parent_comment.author_name}}
 								</a>
diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html
index 689aa5037..b7ed4f028 100644
--- a/files/templates/util/macros.html
+++ b/files/templates/util/macros.html
@@ -78,7 +78,7 @@
 
 		{% if p.author.verified %}<i class="fas fa-badge-check align-middle ml-1 {% if p.author.verified=='Glowiefied' %}glow{% endif %}" style="color:{% if p.author.verifiedcolor %}#{{p.author.verifiedcolor}}{% else %}#1DA1F2{% endif %}" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{p.author.verified}}"></i>
 		{% endif %}
-		<a class="user-name text-decoration-none unbreakable" href="{{p.author.url}}" data-pop-info='{{p.author.json_popover(v) | tojson}}' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="manual" data-content-id="popover" tabindex="0" style="color: #{{p.author.name_color}}; font-weight: bold">
+		<a class="user-name text-decoration-none" href="{{p.author.url}}" data-pop-info='{{p.author.json_popover(v) | tojson}}' data-bs-placement="bottom" data-bs-toggle="popover" data-bs-trigger="manual" data-content-id="popover" tabindex="0" style="color: #{{p.author.name_color}}; font-weight: bold">
 			<div class="profile-pic-30-wrapper" style="margin-top:9px">
 				<img loading="lazy" alt="@{{p.author.username}}'s profile picture" src="{{p.author.profile_url}}" class="profile-pic-30 mr-2">
 				{% if p.author.hat_active(v)[0] -%}