diff --git a/templates/popular.tpl b/templates/popular.tpl
index 1b945d8..0aa846b 100644
--- a/templates/popular.tpl
+++ b/templates/popular.tpl
@@ -7,11 +7,11 @@
 <div class="popular">
 	<div class="btn-toolbar">
 		<div class="pull-left">
-			<!-- IF loggedIn -->
+			<!-- IF canPost -->
 			<button component="category/post" id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
 			<!-- ELSE -->
 			<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
-			<!-- ENDIF loggedIn -->
+			<!-- ENDIF canPost -->
 		</div>
 
 		<!-- IMPORT partials/category-filter.tpl -->
diff --git a/templates/recent.tpl b/templates/recent.tpl
index 152afad..b3857e9 100644
--- a/templates/recent.tpl
+++ b/templates/recent.tpl
@@ -7,11 +7,11 @@
 <div class="recent">
 	<div class="btn-toolbar">
 		<div class="pull-left">
-			<!-- IF loggedIn -->
+			<!-- IF canPost -->
 			<button component="category/post" id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
 			<!-- ELSE -->
 			<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
-			<!-- ENDIF loggedIn -->
+			<!-- ENDIF canPost -->
 			<a href="{config.relative_path}/{selectedFilter.url}" class="inline-block">
 				<div class="alert alert-warning hide" id="new-topics-alert"></div>
 			</a>
diff --git a/templates/unread.tpl b/templates/unread.tpl
index 71e1eb9..1e8a8e7 100644
--- a/templates/unread.tpl
+++ b/templates/unread.tpl
@@ -7,11 +7,7 @@
 <div class="unread">
 	<div class="btn-toolbar">
 		<div class="pull-left">
-			<!-- IF loggedIn -->
 			<button component="category/post" id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
-			<!-- ELSE -->
-			<a component="category/post/guest" href="{config.relative_path}/login" class="btn btn-primary">[[category:guest-login-post]]</a>
-			<!-- ENDIF loggedIn -->
 			<a href="{config.relative_path}/{selectedFilter.url}{querystring}" class="inline-block">
 				<div class="alert alert-warning hide" id="new-topics-alert"></div>
 			</a>