diff --git a/templates/category.tpl b/templates/category.tpl
index 460a466..056834d 100644
--- a/templates/category.tpl
+++ b/templates/category.tpl
@@ -8,10 +8,10 @@
 
 		<div class="clearfix">
 			<!-- IF privileges.topics:create -->
-			<button id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
+			<button component="category/post" id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
 			<!-- ELSE -->
 				<!-- IF !loggedIn -->
-				<a component="post/guest" href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
+				<a component="category/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/recent.tpl b/templates/recent.tpl
index 6f23526..d8f8558 100644
--- a/templates/recent.tpl
+++ b/templates/recent.tpl
@@ -6,9 +6,9 @@
 		</div>
 		<div class="pull-right">
 			<!-- IF loggedIn -->
-			<button id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
+			<button component="category/post" id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
 			<!-- ELSE -->
-			<a component="post/guest" href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
+			<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
 			<!-- ENDIF loggedIn -->
 		</div>
 	</div>