diff --git a/app.js b/app.js
index fb93dac01f..5cba8c4ecc 100644
--- a/app.js
+++ b/app.js
@@ -196,7 +196,9 @@ app.use(helmet.contentSecurityPolicy({
 
 app.use(function (req, res, next) {
     // Make user object available in templates.
-    res.locals.user = req.user;
+    fullUser = req.user;
+    delete fullUser.password;
+    res.locals.user = fullUser;
     next();
 });
 
diff --git a/controllers/story.js b/controllers/story.js
index 2d7ae904e3..a48b011289 100644
--- a/controllers/story.js
+++ b/controllers/story.js
@@ -159,7 +159,6 @@ exports.returnIndividualStory = function(req, res, next) {
             upVotes: story.upVotes,
             comments: story.comments,
             id: story._id,
-            user: req.user || null,
             timeAgo: moment(story.timePosted).fromNow(),
             image: story.image,
             page: 'show',
diff --git a/views/account/show.jade b/views/account/show.jade
index 97887d24db..2438ed680d 100644
--- a/views/account/show.jade
+++ b/views/account/show.jade
@@ -8,7 +8,7 @@ block content
                 if (user && user.profile.username === username)
                     .col-xs-12
                         .text-center
-                            a.btn.btn-big.btn-primary(href="/account") Update my public portfolio
+                            a.btn.btn-big.btn-primary(href="/account") Update my public portfolio or manage my account
                         br
                 .row
                     .col-xs-12