diff --git a/modcp.php b/modcp.php
index 3729d04d..2b3af6e8 100644
--- a/modcp.php
+++ b/modcp.php
@@ -750,7 +750,7 @@ switch ($mode)
 		// Get other users who've posted under this IP
 		//
 		$sql = "SELECT
-				u.user_id,
+				u.user_id, u.user_rank,
 				IF(u.user_id = $anon, p.post_username, u.username) AS username,
 				COUNT(*) as postings
 			FROM " . BB_USERS ." u, " . BB_POSTS . " p
@@ -770,13 +770,14 @@ switch ($mode)
 			do
 			{
 				$id = $row['user_id'];
-				$username = (!$row['username']) ? $lang['GUEST'] : $row['username'];
+				$user_rank = $row['user_rank'];
+				$username = (!$row['username']) ? $lang['GUEST'] : profile_url(array('username' => $row['username'], 'user_id' => $id, 'user_rank' => $user_rank));
 
 				$template->assign_block_vars('userrow', array(
 					'ROW_CLASS'      => !($i % 2) ? 'row4' : 'row5',
-					'USERNAME'       => wbr($username),
+					'USERNAME'       => $username,
 					'POSTS'          => $row['postings'],
-					'U_PROFILE'      => ($id == GUEST_UID) ? "modcp.php?mode=ip&p=$post_id&t=$topic_id" : PROFILE_URL . $id,
+					'U_PROFILE'      => ($id == GUEST_UID) ? "modcp.php?mode=ip&p=$post_id&t=$topic_id" : '',
 					'U_SEARCHPOSTS'  => "search.php?search_author=1&uid=$id",
 				));
 
diff --git a/styles/templates/default/modcp.tpl b/styles/templates/default/modcp.tpl
index 0f129480..7f531bb6 100644
--- a/styles/templates/default/modcp.tpl
+++ b/styles/templates/default/modcp.tpl
@@ -24,7 +24,7 @@
 <!-- BEGIN userrow -->
 <tr>
 	<td class="{userrow.ROW_CLASS} pad_4 nowrap">
-		<p class="floatL" style="width: 160px;"><a href="{userrow.U_PROFILE}"><b>{userrow.USERNAME}</b></a></p>
+		<p class="floatL" style="width: 160px;"><!-- IF userrow.U_PROFILE --><a href="{userrow.U_PROFILE}"><!-- ENDIF --><b>{userrow.USERNAME}</b><!-- IF userrow.U_PROFILE --></a><!-- ENDIF --></p>
 		<p class="floatL">[ {L_POSTS}: {userrow.POSTS} ]</p>
 		<p class="floatR">[ <a href="{userrow.U_SEARCHPOSTS}">{L_SEARCH_USER_POSTS_SHORT}</a> ]&nbsp;</p>
 	</td>