diff --git a/src/routers/account.js b/src/routers/account.js
index 924530f..e1aadb8 100644
--- a/src/routers/account.js
+++ b/src/routers/account.js
@@ -95,7 +95,7 @@ router.get('/', async (request, response) => {
 				});
 			} catch (error) {
 				renderData.error = 'Invalid Discord refresh token. Remove account and relink';
-				response.render('account', renderData);
+				response.render('account/account', renderData);
 			}
 
 			// TODO: Add a dedicated endpoint for updating connections?
@@ -175,7 +175,7 @@ router.get('/', async (request, response) => {
 		renderData.discordAuthURL = discordAuthURL;
 	}
 
-	response.render('account', renderData);
+	response.render('account/account', renderData);
 });
 
 router.get('/login', async (request, response) => {
@@ -188,7 +188,7 @@ router.get('/login', async (request, response) => {
 
 	response.clearCookie('error', { domain: '.pretendo.network' });
 
-	response.render('account_login', renderData);
+	response.render('account/login', renderData);
 });
 
 router.post('/login', async (request, response) => {
@@ -246,7 +246,7 @@ router.get('/register', async (request, response) => {
 	response.clearCookie('username', { domain: '.pretendo.network' });
 	response.clearCookie('mii_name', { domain: '.pretendo.network' });
 
-	response.render('account_register', renderData);
+	response.render('account/register', renderData);
 });
 
 router.post('/register', async (request, response) => {
@@ -289,7 +289,7 @@ router.get('/register', async (request, response) => {
 
 	response.clearCookie('error');
 
-	response.render('account_register', renderData);
+	response.render('account/register', renderData);
 });
 
 router.get('/connect/discord', async (request, response) => {
diff --git a/views/account.handlebars b/views/account/account.handlebars
similarity index 100%
rename from views/account.handlebars
rename to views/account/account.handlebars
diff --git a/views/account_login.handlebars b/views/account/login.handlebars
similarity index 100%
rename from views/account_login.handlebars
rename to views/account/login.handlebars
diff --git a/views/account_register.handlebars b/views/account/register.handlebars
similarity index 100%
rename from views/account_register.handlebars
rename to views/account/register.handlebars