diff --git a/templates/category.tpl b/templates/category.tpl
index 6276479..a6edf4b 100644
--- a/templates/category.tpl
+++ b/templates/category.tpl
@@ -9,7 +9,7 @@
 		<button id="new_topic" class="btn btn-primary">[[category:new_topic_button]]</button>
 		<!-- ELSE -->
 			<!-- IF !loggedIn -->
-			<a href="/login?next=category/{slug}" class="btn btn-primary">[[category:guest-login-post]]</a>
+			<a href="/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 cb81696..aefeaeb 100644
--- a/templates/partials/topic/reply-button.tpl
+++ b/templates/partials/topic/reply-button.tpl
@@ -17,7 +17,7 @@
 <!-- ELSE -->
 
 <!-- IF !privileges.topics:reply -->
-<a href="/login?next=topic/{slug}" class="btn btn-primary">[[topic:guest-login-reply]]</a>
+<a href="/login" class="btn btn-primary">[[topic:guest-login-reply]]</a>
 <!-- ENDIF !privileges.topics:reply -->
 
 <!-- ENDIF loggedIn -->
diff --git a/templates/recent.tpl b/templates/recent.tpl
index 41058eb..e00605f 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="/login?next=recent" class="btn btn-primary">[[category:guest-login-post]]</a>
+			<a href="/login" class="btn btn-primary">[[category:guest-login-post]]</a>
 			<!-- ENDIF loggedIn -->
 		</div>
 	</div>