diff --git a/files/templates/comments.html b/files/templates/comments.html
index a7f709b40..4f9a6dd35 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -345,13 +345,13 @@
 									</li>
 								{% else %}
 									<li id="voting-{{c.id}}-mobile" class="voting list-inline-item d-md-none">
-										<span tabindex="0" class="arrow-{{c.id}}-mobile-up mx-0 pr-1 arrow-mobile-up" onclick="location.href='/login';">
+										<span tabindex="0" class="arrow-{{c.id}}-mobile-up mx-0 pr-1 arrow-mobile-up" onclick="location.href='/login?redirect={{request.path | urlencode}}';">
 											<i class="fas fa-arrow-alt-up mx-0" aria-hidden="true"></i>
 										</span>
 								
 										<span class="comment-mobile-score-{{c.id}} score{% if c.controversial %} controversial{% endif %}"{% if not c.is_banned %} data-bs-toggle="tooltip" data-bs-placement="top" title="+{{ups}} | -{{downs}}"{% endif %}style="cursor: default">{{score}}</span>
 								
-										<span tabindex="0" class="arrow-{{c.id}}-mobile-down arrow-mobile-down mx-0 pl-1 my-0" onclick="location.href='/login';">
+										<span tabindex="0" class="arrow-{{c.id}}-mobile-down arrow-mobile-down mx-0 pl-1 my-0" onclick="location.href='/login?redirect={{request.path | urlencode}}';">
 											<i class="fas fa-arrow-alt-down mx-0" aria-hidden="true"></i>
 										</span>
 									</li>
@@ -379,7 +379,7 @@
 							<button type="button" tabindex="0" onclick="vote('comment', '{{c.id}}', '1')" class="comment-{{c.id}}-up btn caction py-0 m-0 px-3 nobackground arrow-up upvote-button mx-0 comment-{{c.id}}-up {% if voted==1 %}active{% endif %}"></button>
 						
 						{% else %}
-							<button type="button" tabindex="0" class="comment-{{c.id}}-up btn caction nobackground py-0 m-0 px-3 arrow-up" onclick="location.href='/login';"></button>
+							<button type="button" tabindex="0" class="comment-{{c.id}}-up btn caction nobackground py-0 m-0 px-3 arrow-up" onclick="location.href='/login?redirect={{request.path | urlencode}}';"></button>
 						
 						{% endif %}
 						
@@ -396,7 +396,7 @@
 						
 						{% else %}
 						
-							<button type="button" {% if DISABLE_DOWNVOTES %}style="display:None!important"{% endif %} tabindex="0" class="comment-{{c.id}}-down btn caction py-0 m-0 px-3 nobackground arrow-down" onclick="location.href='/login';"></button>
+							<button type="button" {% if DISABLE_DOWNVOTES %}style="display:None!important"{% endif %} tabindex="0" class="comment-{{c.id}}-down btn caction py-0 m-0 px-3 nobackground arrow-down" onclick="location.href='/login?redirect={{request.path | urlencode}}';"></button>
 						
 						{% endif %}
 						
diff --git a/files/templates/header.html b/files/templates/header.html
index ac8219ac6..d8f9e9c44 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -125,7 +125,7 @@
 			{% if v %}
 				<a class="mobile-nav-icon d-md-none" href="{% if sub %}/h/{{sub}}{% endif %}/submit"><i class="fas fa-feather-alt align-middle text-gray-500 black"></i></a>
 			{% else %}
-				<a class="mobile-nav-icon d-md-none" href="/login"><i class="fas fa-feather-alt align-middle text-gray-500 black"></i></a>
+				<a class="mobile-nav-icon d-md-none" href="/login?redirect={{request.path | urlencode}}"><i class="fas fa-feather-alt align-middle text-gray-500 black"></i></a>
 			{% endif %}
 
 			<a class="mobile-nav-icon d-md-none" href="/random_user"><i class="fas fa-music align-middle text-gray-500 black"></i></a>
@@ -277,7 +277,7 @@
 				<a class="btn btn-primary" href="/login?redirect={{request.path | urlencode}}">Sign in</a>
 			</li>
 			<li class="nav-item d-flex align-items-center justify-content-center mx-1">
-				<a class="btn btn-primary" href="/signup">Sign up</a>
+				<a class="btn btn-primary" href="/signup?redirect={{request.path | urlencode}}">Sign up</a>
 			</li>
 			{% endif %}
 		</ul>
@@ -345,7 +345,7 @@
 					<a class="btn btn-primary btn-block" href="/login?redirect={{request.path | urlencode}}">Sign in</a>
 				</li>
 				<li class="nav-item d-flex align-items-center justify-content-center">
-					<a class="btn btn-primary btn-block" href="/signup">Sign up</a>
+					<a class="btn btn-primary btn-block" href="/signup?redirect={{request.path | urlencode}}">Sign up</a>
 				</li>
 			{% endif %}
 			<li class="mt-3">
diff --git a/files/templates/home.html b/files/templates/home.html
index b6b1570f0..c39bfe295 100644
--- a/files/templates/home.html
+++ b/files/templates/home.html
@@ -57,8 +57,8 @@
 				<button type="button" id="follow-sub" class="btn btn-primary btn-follow {% if v.follows(sub.name) %}d-none{% endif %}" onclick="postToastSwitch(this,'/h/{{sub}}/follow','follow-sub','unfollow-sub','d-none')"><i class="fas fa-bell mr-2"></i>Follow {{hole_prefix}}{{sub}}</button>
 				<button type="button" id="unfollow-sub" class="btn btn-primary btn-follow {% if not v.follows(sub.name) %}d-none{% endif %}" onclick="postToastSwitch(this,'/h/{{sub}}/unfollow','follow-sub','unfollow-sub','d-none')"><i class="fas fa-bell-slash mr-2"></i>Unfollow {{hole_prefix}}{{sub}}</button>
 			{% else %}
-				<a class="btn btn-primary btn-block" href="/login"><i class="fas fa-eye-slash mr-2"></i>Block {{hole_prefix}}{{sub}}</a>
-				<a class="btn btn-primary btn-block" href="/login"><i class="fas fa-bell mr-2"></i>Follow {{hole_prefix}}{{sub}}</a>
+				<a class="btn btn-primary btn-block" href="/login?redirect={{request.path | urlencode}}"><i class="fas fa-eye-slash mr-2"></i>Block {{hole_prefix}}{{sub}}</a>
+				<a class="btn btn-primary btn-block" href="/login?redirect={{request.path | urlencode}}"><i class="fas fa-bell mr-2"></i>Follow {{hole_prefix}}{{sub}}</a>
 			{% endif %}
 		{% endif %}
 
diff --git a/files/templates/mobile_navigation_bar.html b/files/templates/mobile_navigation_bar.html
index 8656206be..a4122b5bf 100644
--- a/files/templates/mobile_navigation_bar.html
+++ b/files/templates/mobile_navigation_bar.html
@@ -69,7 +69,7 @@
 				{%- endif %}
 {% else %}
 				<button type="button" class="col px-0 mr-3 btn btn-dead m-0" style="background: None !important; border: None;">
-						<a href="/signup" class="text-decoration-none">
+						<a href="/signup?redirect={{request.path | urlencode}}" class="text-decoration-none">
 								<div class="text-center text-muted">
 										<i class="fas fa-user-plus text-lg"></i>
 										<div class="text-small">Sign Up</div>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 183d563e6..adf7723c6 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -471,7 +471,7 @@
 					<h5 class="card-title">Jump in the discussion.</h5>
 					<p class="card-text">No email address required.</p>
 					<div>
-						<a href="/signup" class="btn btn-primary">Sign up</a>
+						<a href="/signup?redirect={{request.path | urlencode}}" class="btn btn-primary">Sign up</a>
 						<a href="/login?redirect={{request.path | urlencode}}" class="btn btn-link text-muted">Sign in</a>
 					</div>
 				</div>
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index fce6ed9ec..4618fadc2 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -65,11 +65,11 @@
 
 			{% else %}
 
-				<div tabindex="0" role="button" onclick="vote('post', '{{p.id}}', '1')" class="post-{{p.id}}-up mx-auto arrow-up" onclick="location.href='/login';"></div>
+				<div tabindex="0" role="button" onclick="vote('post', '{{p.id}}', '1')" class="post-{{p.id}}-up mx-auto arrow-up" onclick="location.href='/login?redirect={{request.path | urlencode}}';"></div>
 
 				<span class="post-{{p.id}}-score-none score{% if p.controversial %} controversial{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="right" title="+{{ups}} | -{{downs}}"{% endif %}style="cursor: default">{{score}}</span>
 
-				<div {% if DISABLE_DOWNVOTES %}style="display:None!important"{% endif %} tabindex="0" role="button" onclick="vote('post', '{{p.id}}', '-1')" class="post-{{p.id}}-down text-muted mx-auto arrow-down" onclick="location.href='/login';"></div>
+				<div {% if DISABLE_DOWNVOTES %}style="display:None!important"{% endif %} tabindex="0" role="button" onclick="vote('post', '{{p.id}}', '-1')" class="post-{{p.id}}-down text-muted mx-auto arrow-down" onclick="location.href='/login?redirect={{request.path | urlencode}}';"></div>
 
 			{% endif %}
 
@@ -270,13 +270,13 @@
 				</li>
 			{% else %}
 				<li id="voting-{{p.id}}-mobile" class="voting list-inline-item d-md-none">
-					<span tabindex="0" class="arrow-{{p.id}}-mobile-up mx-0 pr-1 arrow-mobile-up" onclick="location.href='/login';">
+					<span tabindex="0" class="arrow-{{p.id}}-mobile-up mx-0 pr-1 arrow-mobile-up" onclick="location.href='/login?redirect={{request.path | urlencode}}';">
 						<i class="fas fa-arrow-alt-up mx-0" aria-hidden="true"></i>
 					</span>
 
 					<span class="post-mobile-score-{{p.id}} score{% if p.controversial %} controversial{% endif %}"{% if not p.is_banned %} data-bs-toggle="tooltip" data-bs-placement="top" title="+{{ups}} | -{{downs}}"{% endif %}style="cursor: default">{{score}}</span>
 
-					<span tabindex="0" class="arrow-{{p.id}}-mobile-down arrow-mobile-down mx-0 pl-1 my-0" onclick="location.href='/login';">
+					<span tabindex="0" class="arrow-{{p.id}}-mobile-down arrow-mobile-down mx-0 pl-1 my-0" onclick="location.href='/login?redirect={{request.path | urlencode}}';">
 						<i class="fas fa-arrow-alt-down mx-0" aria-hidden="true"></i>
 					</span>
 				</li>
diff --git a/files/templates/user_listing.html b/files/templates/user_listing.html
index 13cfa8c7a..c540abe0e 100644
--- a/files/templates/user_listing.html
+++ b/files/templates/user_listing.html
@@ -23,7 +23,7 @@
 						<div id="button-unsub-{{u.id}}" style="z-index: 2" class="{% if not u.has_follower(v) %} d-none{% endif %}"><button type="button" class="btn btn-secondary" onclick="postToastSwitch(this,'/unfollow/{{u.username}}','button-sub-{{u.id}}','button-unsub-{{u.id}}','d-none')">Unfollow</button></div>
 						{% endif %}
 					{% else %}
-						<div id="button-sub-{{u.id}}" style="z-index: 2"><a class="btn btn-primary" href="/signup">Follow</a></div>
+						<div id="button-sub-{{u.id}}" style="z-index: 2"><a class="btn btn-primary" href="/signup?redirect={{request.path | urlencode}}">Follow</a></div>
 					{% endif %}
 				</div>