diff --git a/public/src/app.js b/public/src/app.js
index 7e6b5f4b70..dee1cb06f9 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -108,7 +108,7 @@ var socket,
 				templates.setGlobal('loggedIn', parseInt(data.uid, 10) !== 0);
 
 				app.showLoginMessage();
-
+				app.replaceSelfLinks();
 				$(window).trigger('action:connected');
 			});
 
diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index efc4010edb..97e87ce5a7 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -380,6 +380,7 @@ define('forum/topic', ['forum/pagination', 'forum/infinitescroll', 'forum/topic/
 
 		app.populateOnlineUsers();
 		app.createUserTooltips();
+		app.replaceSelfLinks(html.find('a'));
 		utils.addCommasToNumbers(html.find('.formatted-number'));
 		utils.makeNumbersHumanReadable(html.find('.human-readable-number'));
 		html.find('span.timeago').timeago();