diff --git a/nixtape/themes/gnufm/templates/user-profile.tpl b/nixtape/themes/gnufm/templates/user-profile.tpl
index e8fa2d40e819e39f53036487db382a349ada8c55..06d419ae568377fa8e5d1338e999cc93cca41d47 100644
--- a/nixtape/themes/gnufm/templates/user-profile.tpl
+++ b/nixtape/themes/gnufm/templates/user-profile.tpl
@@ -32,7 +32,7 @@
 	<h3 style='text-align: center; clear: left;'>{t name=$me->name}Free artists that %1 loves{/t}</h3>
 	<ul class="tagcloud">
 		{section name=i loop=$lovedArtists}
-			<li style='font-size:{$lovedArtists[i].size}'><a href='{$lovedArtists[i].url}'>{$lovedArtists[i].artist}</a></li>
+			<li style='font-size:{$lovedArtists[i].size}'><a href='{$lovedArtists[i].pageurl}'>{$lovedArtists[i].name}</a></li>
 		{/section}
 	</ul>
 {/if}
diff --git a/nixtape/user-profile.php b/nixtape/user-profile.php
index b79548a2274636fa931a0bf50e7ca43f3a93e78f..2a4fc2caca3622b26e3c82ffbdd887a6da1ed8e2 100644
--- a/nixtape/user-profile.php
+++ b/nixtape/user-profile.php
@@ -53,7 +53,7 @@ if (isset($user->name)) {
 	if ($user->hasLoved()) {
 		$recommendedArtists = $user->getRecommended(10);
 		$smarty->assign('recommendedArtists', $recommendedArtists);
-		$lovedArtists = $user->getLovedArtists(10);
+		$lovedArtists = TagCloud::generateTagCloud('loved', 'artist', 10, 'userid', $user->uniqueid);
 		$smarty->assign('lovedArtists', $lovedArtists);
 	}
 	$smarty->assign('isme', ($this_user->name == $user->name));