diff --git a/src/middleware/redirect.js b/src/middleware/redirect.js
index ce7f653..7ca4fb7 100644
--- a/src/middleware/redirect.js
+++ b/src/middleware/redirect.js
@@ -3,6 +3,10 @@ async function redirectMiddleware(request, response, next) {
 		request.redirect = request.body.redirect?.startsWith('/') ? request.body.redirect : null;
 	}
 
+	if (request.query.redirect) {
+		response.locals.redirect = request.query.redirect?.startsWith('/') ? request.query.redirect : null;
+	}
+
 	return next();
 }
 
diff --git a/src/routers/account.js b/src/routers/account.js
index adacc2c..10f4423 100644
--- a/src/routers/account.js
+++ b/src/routers/account.js
@@ -207,8 +207,6 @@ 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);
@@ -267,13 +265,6 @@ router.get('/register', async (request, response) => {
 	response.clearCookie('username', { domain: '.pretendo.network' });
 	response.clearCookie('mii_name', { domain: '.pretendo.network' });
 
-	let redirect = request.query.redirect;
-	if (!redirect.startsWith('/')) {
-		redirect = null;
-	}
-	
-	renderData.redirect = redirect;
-
 	response.render('account/register', renderData);
 });