diff --git a/files/assets/js/chat.js b/files/assets/js/chat.js
index c24641766..ef16142ac 100644
--- a/files/assets/js/chat.js
+++ b/files/assets/js/chat.js
@@ -93,9 +93,11 @@ socket.on('speak', function(json) {
 		else
 			document.getElementsByClassName('avatar-hat')[0].removeAttribute("src")
 
-		document.getElementsByClassName('userlink')[0].href = '/@' + json['username']
-		document.getElementsByClassName('userlink')[0].style.color = '#' + json['namecolor']
-		document.getElementsByClassName('userlink')[0].innerHTML = json['username']
+		const userlink = document.getElementsByClassName('userlink')[0]
+
+		userlink.innerHTML = userlink.innerHTML.replace(userlink.textContent, json['username'])
+		userlink.href = '/@' + json['username']
+		userlink.style.color = '#' + json['namecolor']
 
 		document.getElementsByClassName('user_id')[0].value = json['user_id']
 
@@ -119,7 +121,7 @@ socket.on('speak', function(json) {
 			}
 			document.getElementsByClassName('quotes')[0].classList.remove("d-none")
 			document.getElementsByClassName('QuotedMessageLink')[0].href = '#' + json['quotes']
-			document.getElementsByClassName('QuotedUser')[0].innerHTML = quoted.parentElement.querySelector('.userlink').innerHTML
+			document.getElementsByClassName('QuotedUser')[0].innerHTML = quoted.parentElement.querySelector('.userlink').textContent
 			document.getElementsByClassName('QuotedMessage')[0].innerHTML = quoted.querySelector('.text').innerHTML
 		}
 	}
@@ -175,7 +177,7 @@ function quote(t) {
 	const text = t.parentElement.getElementsByClassName("text")[0].innerHTML.replace(/\*/g,"\\*").split('\n').pop()
 	document.getElementById('QuotedMessage').innerHTML = text
 
-	const username = t.parentElement.parentElement.parentElement.parentElement.getElementsByClassName('userlink')[0].innerHTML
+	const username = t.parentElement.parentElement.parentElement.parentElement.getElementsByClassName('userlink')[0].textContent
 	document.getElementById('QuotedUser').innerHTML = username
 
 	const id = t.parentElement.parentElement.parentElement.id
diff --git a/files/templates/chat.html b/files/templates/chat.html
index 496b2f01c..37e1fa052 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -25,13 +25,7 @@
 
 			{% macro chat_group_template(id, m) %}
 				<div class="chat-group">
-					<div class="avatar profile-pic-20-wrapper">
-						<img class="avatar-pic pp20 mr-1" {% if m %}src="/pp/{{m['user_id']}}"{% endif %}>
-						<img class="avatar-hat profile-pic-20-hat hat" loading="lazy" {% if m %}src="{{m['hat']}}"{% endif %}>
-					</div>
-					<a class="font-weight-bold text-black userlink" target="_blank" {% if m %}style="color:#{{m['namecolor']}}" href="/@{{m['username']}}" {% endif %}>
-						{% if m %}{{m['username']}}{% endif %}
-					</a>
+					<a class="font-weight-bold text-black userlink" target="_blank" {% if m %}style="color:#{{m['namecolor']}}" href="/@{{m['username']}}" {% endif %}><div class="avatar profile-pic-20-wrapper mr-1"><img class="avatar-pic pp20 mr-1" {% if m %}src="/pp/{{m['user_id']}}"{% endif %}><img class="avatar-hat profile-pic-20-hat hat" loading="lazy" {% if m %}src="{{m['hat']}}"{% endif %}></div>{% if m %}{{m['username']}}{% else %}NULL{% endif %}</a>
 					<span class="text-black time ml-1 mb-3 text-center">{% if m %}{{m['time'] | timestamp}}{% else %}just now{% endif %}</span>
 					<input hidden class="user_id" {% if m %}value="{{m['user_id']}}"{% endif %}>
 			{% endmacro %}