diff --git a/com.woltlab.wcf/templates/messageSidebar.tpl b/com.woltlab.wcf/templates/messageSidebar.tpl
index 7613789e9a..20621deadb 100644
--- a/com.woltlab.wcf/templates/messageSidebar.tpl
+++ b/com.woltlab.wcf/templates/messageSidebar.tpl
@@ -104,7 +104,7 @@
 								<dd>{#$userProfile->activityPoints}</dd>
 							{/if}
 							
-							{if MODULE_TROPHY && MESSAGE_SIDEBAR_ENABLE_TROPHY_POINTS && $userProfile->trophyPoints && $__wcf->session->getPermission('user.profile.trophy.canSeeTrophies') && ($userProfile->isAccessible('canViewTrophies') || $userProfile->userID == $__wcf->session->userID)}
+							{if MODULE_TROPHY && MESSAGE_SIDEBAR_ENABLE_TROPHY_POINTS && $userProfile->showTrophyPoints()}
 								<dt><a href="#" class="trophyPoints jsTooltip userTrophyOverlayList" data-user-id="{$userProfile->userID}" title="{lang user=$userProfile}wcf.user.trophy.showTrophies{/lang}">{lang}wcf.user.trophy.trophyPoints{/lang}</a></dt>
 								<dd>{#$userProfile->trophyPoints}</dd>
 							{/if}
diff --git a/com.woltlab.wcf/templates/userCard.tpl b/com.woltlab.wcf/templates/userCard.tpl
index c5d2ceca1b..096fd25589 100644
--- a/com.woltlab.wcf/templates/userCard.tpl
+++ b/com.woltlab.wcf/templates/userCard.tpl
@@ -114,24 +114,24 @@
 					{event name='beforeStats'}
 					
 					{if MODULE_LIKE && $user->likesReceived}
-						<div class="userCard__footer__statsItem">
+						<a class="userCard__footer__statsItem" href="{$user->getLink()}#likes">
 							<span class="userCard__footer__statsItem__key">{lang}wcf.user.reactionsReceived{/lang}</span>
 							<span class="userCard__footer__statsItem__value">{#$user->likesReceived}</span>
-						</div>
+						</a>
 					{/if}
 
 					{if $user->activityPoints}
-						<div class="userCard__footer__statsItem">
+						<button type="button" class="userCard__footer__statsItem activityPointsDisplay" data-user-id="{$user->userID}">
 							<span class="userCard__footer__statsItem__key">{lang}wcf.user.activityPoint{/lang}</span>
 							<span class="userCard__footer__statsItem__value">{#$user->activityPoints}</span>
-						</div>
+						</button>
 					{/if}
 
 					{if $user->showTrophyPoints()}
-						<div class="userCard__footer__statsItem">
+						<button type="button" class="userCard__footer__statsItem userTrophyOverlayList" data-user-id="{$user->userID}">
 							<span class="userCard__footer__statsItem__key">{lang}wcf.user.trophy.trophyPoints{/lang}</span>
 							<span class="userCard__footer__statsItem__value">{#$user->trophyPoints}</span>
-						</div>
+						</button>
 					{/if}
 
 					{event name='afterStats'}
diff --git a/com.woltlab.wcf/templates/userSidebar.tpl b/com.woltlab.wcf/templates/userSidebar.tpl
index efaaab0f29..c153b4b4e6 100644
--- a/com.woltlab.wcf/templates/userSidebar.tpl
+++ b/com.woltlab.wcf/templates/userSidebar.tpl
@@ -1,5 +1,5 @@
 {if !$user->isProtected()}
-	{if MODULE_TROPHY && $__wcf->session->getPermission('user.profile.trophy.canSeeTrophies') && ($user->isAccessible('canViewTrophies') || $user->userID == $__wcf->session->userID) && $specialTrophyCount}
+	{if $specialTrophyCount && $user->showTrophyPoints()}
 		<section class="box" data-static-box-identifier="com.woltlab.wcf.UserTrophies">
 			<h2 class="boxTitle">{lang}wcf.user.trophy.trophyPoints{/lang} <span class="badge">{#$user->trophyPoints}</span></h2>