diff --git a/templates/category.tpl b/templates/category.tpl
index 004d63c..460a466 100644
--- a/templates/category.tpl
+++ b/templates/category.tpl
@@ -11,7 +11,7 @@
 			<button id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
 			<!-- ELSE -->
 				<!-- IF !loggedIn -->
-				<a href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
+				<a component="post/guest" href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
 				<!-- ENDIF !loggedIn -->
 			<!-- ENDIF privileges.topics:create -->
 
diff --git a/templates/partials/topic/reply-button.tpl b/templates/partials/topic/reply-button.tpl
index f6d8521..b464a1e 100644
--- a/templates/partials/topic/reply-button.tpl
+++ b/templates/partials/topic/reply-button.tpl
@@ -22,6 +22,6 @@
 <!-- ELSE -->
 
 <!-- IF !privileges.topics:reply -->
-<a href="{config.relative_path}/login" class="btn btn-primary">[[topic:guest-login-reply]]</a>
+<a component="topic/reply/guest" href="{config.relative_path}/login" class="btn btn-primary">[[topic:guest-login-reply]]</a>
 <!-- ENDIF !privileges.topics:reply -->
 <!-- ENDIF loggedIn -->
\ No newline at end of file
diff --git a/templates/recent.tpl b/templates/recent.tpl
index 8586fae..6f23526 100644
--- a/templates/recent.tpl
+++ b/templates/recent.tpl
@@ -8,7 +8,7 @@
 			<!-- IF loggedIn -->
 			<button id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
 			<!-- ELSE -->
-			<a href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
+			<a component="post/guest" href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
 			<!-- ENDIF loggedIn -->
 		</div>
 	</div>