diff --git a/core/server.js b/core/server.js
index 25b4c3f4fe..e5633c4ef2 100644
--- a/core/server.js
+++ b/core/server.js
@@ -112,7 +112,8 @@ function ghostLocals(req, res, next) {
             _.extend(res.locals,  {
                 currentUser: {
                     name: currentUser.attributes.name,
-                    profile: currentUser.attributes.image
+                    email: currentUser.attributes.email,
+                    image: currentUser.attributes.image
                 }
             });
             next();
diff --git a/core/server/views/partials/navbar.hbs b/core/server/views/partials/navbar.hbs
index d9d7ab2430..ab4478f1b9 100644
--- a/core/server/views/partials/navbar.hbs
+++ b/core/server/views/partials/navbar.hbs
@@ -9,8 +9,8 @@
 
             <li id="usermenu" class="subnav">
                 <a href="#" data-toggle="ul" class="dropdown">
-                    <img class="avatar" src="{{#if currentUser.profile}}{{currentUser.profile}}{{else}}/shared/img/user-image.png{{/if}}" alt="Avatar" />
-                    <span class="name">{{#if currentUser.name}}{{currentUser.name}}{{else}}Ghost{{/if}}</span>
+                    <img class="avatar" src="{{#if currentUser.image}}{{currentUser.image}}{{else}}/shared/img/user-image.png{{/if}}" alt="Avatar" />
+                    <span class="name">{{#if currentUser.name}}{{currentUser.name}}{{else}}{{currentUser.email}}{{/if}}</span>
                 </a>
                 <ul class="overlay">
                     <li class="usermenu-profile"><a href="/ghost/settings/user/">Your Profile</a></li>