diff --git a/public/src/app.js b/public/src/app.js
index fa119c72fe..252f65ccc4 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -206,7 +206,7 @@ if (document.readyState === 'loading') {
 		if (!isTouchDevice) {
 			els = els || $('body');
 			els.tooltip({
-				selector: 'a>.avatar',
+				selector: '.avatar.avatar-tooltip',
 				placement: placement || 'top',
 				container: '#content',
 				animation: false,
diff --git a/src/topics/events.js b/src/topics/events.js
index 95f3d772d3..6e4c28a616 100644
--- a/src/topics/events.js
+++ b/src/topics/events.js
@@ -104,7 +104,7 @@ function renderUser(event) {
 	if (!event.user || event.user.system) {
 		return '[[global:system-user]]';
 	}
-	return `<a href="${relative_path}/user/${event.user.userslug}">${helpers.buildAvatar(event.user, '16px', true)} ${event.user.username}</a>`;
+	return `${helpers.buildAvatar(event.user, '16px', true)} <a href="${relative_path}/user/${event.user.userslug}">${event.user.username}</a>`;
 }
 
 function renderTimeago(event) {