diff --git a/library/includes/ucp/topic_watch.php b/library/includes/ucp/topic_watch.php
index 269b1920..6591d4bc 100644
--- a/library/includes/ucp/topic_watch.php
+++ b/library/includes/ucp/topic_watch.php
@@ -18,11 +18,11 @@ $page_cfg['include_bbcode_js'] = true;
 $tracking_topics = get_tracks('topic');
 
 $user_id = $userdata['user_id'];
-if (isset($_GET['uid']))
+if (isset($_GET[POST_USERS_URL]))
 {
-	if (get_username($_GET['uid']))
+	if (get_username($_GET[POST_USERS_URL]))
 	{
-		if ($_GET['uid'] == $userdata['user_id'] || IS_ADMIN) $user_id = DB()->escape($_GET['uid']);
+		if ($_GET[POST_USERS_URL] == $userdata['user_id'] || IS_ADMIN) $user_id = DB()->escape($_GET[POST_USERS_URL]);
 		else bb_die($lang['NOT_AUTHORISED']);
 	}
 	else bb_die($lang['USER_NOT_EXIST']);
diff --git a/styles/templates/default/usercp_viewprofile.tpl b/styles/templates/default/usercp_viewprofile.tpl
index 967205dc..e7c0586e 100644
--- a/styles/templates/default/usercp_viewprofile.tpl
+++ b/styles/templates/default/usercp_viewprofile.tpl
@@ -376,7 +376,7 @@ ajax.callback.gen_passkey = function(data){
 						[ <a href="{U_SEARCH_USER}" class="med">{L_SEARCH_USER_POSTS}</a> ]
 						[ <a href="{U_SEARCH_TOPICS}" class="med">{L_SEARCH_USER_TOPICS}</a> ]
 						[ <a href="{U_SEARCH_RELEASES}" class="med">{L_SEARCH_RELEASES}</a> ]
-						<!-- IF PROFILE_USER || IS_ADMIN -->[ <a href="{U_WATCHED_TOPICS}&uid={PROFILE_USER_ID}" class="med">{L_WATCHED_TOPICS}</a> ]<!-- ENDIF -->
+						<!-- IF PROFILE_USER || IS_ADMIN -->[ <a href="{U_WATCHED_TOPICS}&u={PROFILE_USER_ID}" class="med">{L_WATCHED_TOPICS}</a> ]<!-- ENDIF -->
 						[ <a title="{L_ATOM_SUBSCRIBE}" href="#" onclick="return post2url('feed.php', {mode: 'get_feed_url', type: 'u', id: {PROFILE_USER_ID}})">{FEED_IMG}</a> ]
 					</p>
 				</td>