diff --git a/src/routers/account.js b/src/routers/account.js
index 15b6dbd..9d15ee5 100644
--- a/src/routers/account.js
+++ b/src/routers/account.js
@@ -211,13 +211,15 @@ router.get('/login', async (request, response) => {
 		error: request.cookies.error
 	};
 
+	renderData.redirect = request.query.redirect;
+
 	response.clearCookie('error', { domain: '.pretendo.network' });
 
 	response.render('account/login', renderData);
 });
 
 router.post('/login', async (request, response) => {
-	const { username, password } = request.body;
+	const { username, password, redirect } = request.body;
 
 	let apiResponse = await util.apiPostGetRequest('/v1/login', {}, {
 		username,
@@ -252,7 +254,7 @@ router.post('/login', async (request, response) => {
 
 	response.cookie('ph', encryptedBody.toString('hex'), { domain: '.pretendo.network' });
 
-	response.redirect('/account');
+	response.redirect(redirect || '/account');
 });
 
 router.get('/register', async (request, response) => {
@@ -271,11 +273,14 @@ router.get('/register', async (request, response) => {
 	response.clearCookie('username', { domain: '.pretendo.network' });
 	response.clearCookie('mii_name', { domain: '.pretendo.network' });
 
+	const redirect = request.query.redirect;
+	renderData.redirect = redirect;
+
 	response.render('account/register', renderData);
 });
 
 router.post('/register', async (request, response) => {
-	const { email, username, mii_name, password, password_confirm, 'h-captcha-response': hCaptchaResponse } = request.body;
+	const { email, username, mii_name, password, password_confirm, 'h-captcha-response': hCaptchaResponse, redirect } = request.body;
 
 	response.cookie('email', email, { domain: '.pretendo.network' });
 	response.cookie('username', username, { domain: '.pretendo.network' });
@@ -301,7 +306,7 @@ router.post('/register', async (request, response) => {
 	response.clearCookie('username', { domain: '.pretendo.network' });
 	response.clearCookie('mii_name', { domain: '.pretendo.network' });
 
-	response.redirect('/account');
+	response.redirect(redirect || '/account');
 });
 
 router.get('/logout', async(_request, response) => {
@@ -387,7 +392,7 @@ router.get('/online-files', async (request, response) => {
 
 	// Verify the user is logged in
 	if (!request.cookies.access_token || !request.cookies.refresh_token|| !request.cookies.ph) {
-		return response.redirect('/account/login');
+		return response.redirect('/account/login?redirect=/online-files');
 	}
 
 	// Attempt to get user data
@@ -531,7 +536,7 @@ router.get('/miieditor', async (request, response) => {
 router.get('/upgrade', async (request, response) => {
 	// Verify the user is logged in
 	if (!request.cookies.access_token || !request.cookies.refresh_token || !request.cookies.ph) {
-		return response.redirect('/account/login');
+		return response.redirect('/account/login?redirect=/account/upgrade');
 	}
 
 	// Attempt to get user data
diff --git a/views/account/login.handlebars b/views/account/login.handlebars
index 2a27ba7..9507a36 100644
--- a/views/account/login.handlebars
+++ b/views/account/login.handlebars
@@ -18,9 +18,10 @@
 				<a href="/account/passwordreset" class="pwdreset">Forgot your password?</a>
 			</div>
 			<input name="grant_type" id="grant_type" type="hidden" value="password">
+			<input name="redirect" id="redirect" type="hidden" value="{{redirect}}">
 			<div class="buttons">
 				<button type="submit">Login</button>
-			<a href="/account/register" class="register">Don't have an account?</a>
+			<a href="/account/register{{#if redirect}}?redirect={{redirect}}{{/if}}" class="register">Don't have an account?</a>
 			</div>
 		</form>
 	</div>
diff --git a/views/account/register.handlebars b/views/account/register.handlebars
index c003bad..be0ea16 100644
--- a/views/account/register.handlebars
+++ b/views/account/register.handlebars
@@ -30,9 +30,10 @@
 				<input name="password_confirm" id="password_confirm" type="password" autocomplete="new-password" required>
 			</div>
 			<div class="h-captcha" data-sitekey="cf3fd74e-93ca-47e6-9fa0-5fc439de06d4"></div>
+			<input name="redirect" id="redirect" type="hidden" value="{{redirect}}">
 			<div class="buttons">
 				<button type="submit">Register</button>
-				<a href="/account/login" class="register">Already have an account?</a>
+				<a href="/account/login{{#if redirect}}?redirect={{redirect}}{{/if}}" class="register">Already have an account?</a>
 			</div>
 		</form>
 	</div>