diff --git a/controllers/user.js b/controllers/user.js
index a3f112d902..83d3203140 100644
--- a/controllers/user.js
+++ b/controllers/user.js
@@ -10,7 +10,7 @@ var User = require('../models/User');
  * User account page
  */
 exports.getAccount = function(req, res) {
-  res.render('account', {
+  res.render('account/account', {
     title: 'Account Management',
     success: req.flash('success'),
     error: req.flash('error')
@@ -85,7 +85,7 @@ exports.postDeleteAccount = function(req, res, next) {
  */
 exports.getLogin = function(req, res) {
   if (req.user) return res.redirect('back');
-  res.render('login', {
+  res.render('account/login', {
     title: 'Login',
     messages: req.flash('messages')
   });
@@ -115,7 +115,7 @@ exports.postLogin = function(req, res, next) {
  */
 exports.getSignup = function(req, res) {
   if (req.user) return res.redirect('back');
-  res.render('signup', {
+  res.render('account/signup', {
     title: 'Create Account',
     messages: req.flash('messages')
   });
diff --git a/views/account.jade b/views/account/account.jade
similarity index 99%
rename from views/account.jade
rename to views/account/account.jade
index c7c3131fda..4d1e4c816c 100644
--- a/views/account.jade
+++ b/views/account/account.jade
@@ -1,4 +1,4 @@
-extends layout
+extends ../layout
 
 block content
   if error.length
diff --git a/views/login.jade b/views/account/login.jade
similarity index 98%
rename from views/login.jade
rename to views/account/login.jade
index 709d7a3b88..960eccfddf 100644
--- a/views/login.jade
+++ b/views/account/login.jade
@@ -1,4 +1,4 @@
-extends layout
+extends ../layout
 
 block content
   if messages.length
diff --git a/views/signup.jade b/views/account/signup.jade
similarity index 98%
rename from views/signup.jade
rename to views/account/signup.jade
index 872227739b..ca6cf4c540 100644
--- a/views/signup.jade
+++ b/views/account/signup.jade
@@ -1,4 +1,4 @@
-extends layout
+extends ../layout
 
 block content
   if messages.length