diff --git a/client/components/ChatUserList.vue b/client/components/ChatUserList.vue
index 5c7bfb0e..0f079e2e 100644
--- a/client/components/ChatUserList.vue
+++ b/client/components/ChatUserList.vue
@@ -28,7 +28,7 @@
 				<template v-if="userSearchInput.length > 0">
 					<UsernameFiltered
 						v-for="user in users"
-						:onHover="hoverUser"
+						:on-hover="hoverUser"
 						:key="user.original.nick"
 						:active="user.original === activeUser"
 						:user="user"/>
@@ -36,7 +36,7 @@
 				<template v-else>
 					<Username
 						v-for="user in users"
-						:onHover="hoverUser"
+						:on-hover="hoverUser"
 						:key="user.nick"
 						:active="user === activeUser"
 						:user="user"/>
diff --git a/client/components/Username.vue b/client/components/Username.vue
index b5388af9..29184d19 100644
--- a/client/components/Username.vue
+++ b/client/components/Username.vue
@@ -2,9 +2,8 @@
 	<span
 		:class="['user', $options.filters.colorClass(user.nick), active ? 'active' : '']"
 		:data-name="user.nick"
-		role="button">{{ user.mode }}{{ user.nick }}
-		@mouseover="hover"
-	></span>
+		role="button"
+		v-on="onHover ? { mouseover: hover } : {}">{{ user.mode }}{{ user.nick }}</span>
 </template>
 
 <script>
@@ -17,7 +16,7 @@ export default {
 	},
 	methods: {
 		hover() {
-			this.onHover ? this.onHover(this.user) : null;
+			return this.onHover(this.user);
 		},
 	},
 };
diff --git a/client/components/UsernameFiltered.vue b/client/components/UsernameFiltered.vue
index cc69e539..c65a6e31 100644
--- a/client/components/UsernameFiltered.vue
+++ b/client/components/UsernameFiltered.vue
@@ -2,8 +2,8 @@
 	<span
 		:class="['user', $options.filters.colorClass(user.original.nick), active ? 'active' : '']"
 		:data-name="user.original.nick"
-		@mouseover="hover"
 		role="button"
+		@mouseover="hover"
 		v-html="user.original.mode + user.string"/>
 </template>