diff --git a/lib/persona.js b/lib/persona.js
index d289496..f59a807 100644
--- a/lib/persona.js
+++ b/lib/persona.js
@@ -165,9 +165,15 @@ $(document).ready(function() {
 
 	function setupHoverCards() {
 		require(['components'], function(components) {
-			components.get('user/picture')
-				.on('mouseover', generateUserCard);
-		});	
+			components.get('topic')
+				.on('mouseover', '[component="user/picture"]', generateUserCard);
+		});
+
+		$(window).on('action:posts.loading', function(ev, data) {
+			for (var i = 0, ii = data.posts.length; i < ii; i++) {
+				(ajaxify.data.topics || ajaxify.data.posts)[data.posts[i].index] = data.posts[i];
+			}
+		});
 	}
 
 	function generateUserCard() {