diff --git a/controllers/user.js b/controllers/user.js
index 8444cf9a0e..98b72486ae 100644
--- a/controllers/user.js
+++ b/controllers/user.js
@@ -6,7 +6,11 @@ var mongoose = require('mongoose'),
 var User = require('../models/User');
 
 exports.account = function(req, res) {
-  res.render('account', { user: req.user });
+  res.render('account', {
+    title: 'Account Management',
+    user: req.user,
+    messages: req.flash('messages')
+  });
 };
 
 /**
diff --git a/views/account.jade b/views/account.jade
new file mode 100644
index 0000000000..e2d62a365a
--- /dev/null
+++ b/views/account.jade
@@ -0,0 +1,27 @@
+extends layout
+block content
+  h3 Account Management
+  form(role='form', method='POST')
+    .form-group
+      .row
+        .col-xs-6.col-sm-6.col-md-6
+          label(for='firstName') First Name
+          input.form-control(type='text', name='firstName', id='firstName', placeholder='First Name', autofocus='')
+        .col-xs-6.col-sm-6.col-md-6
+          label(for='lastName') Last Name
+          input.form-control(type='text', name='lastName', id='lastName', placeholder='Last Name')
+    .form-group
+      label(for='email') Email
+      input.form-control(type='email', name='email', id='email', placeholder='Email')
+    .form-group
+      label(for='password') Password
+      input.form-control(type='password', name='password', id='password', placeholder='Password')
+    .form-group
+      label(for='confirmPassword') Confirm Password
+      input.form-control(type='password', id='confirmPassword', placeholder='Confirm Password')
+    .form-group
+      button.btn.btn.btn-primary(type='submit') Update
+  if messages.length
+    .alert.alert-danger
+      for message in messages
+        div= message
\ No newline at end of file
diff --git a/views/layout.jade b/views/layout.jade
index 1b3936491e..918b925ec8 100644
--- a/views/layout.jade
+++ b/views/layout.jade
@@ -37,8 +37,8 @@ html
               li(class=title=='Create Account'?'active':undefined)
                 a(href='/signup') Create Account
             else
-              li.navbar-text
-                | Welcome, #{user.firstName}  #{user.lastName}
+              li
+                a(href='/account') Welcome,  #{user.firstName} #{user.lastName}
               li
                 a(href='/logout') Logout
   .container