diff --git a/src/app/index.coffee b/src/app/index.coffee
index 60ee6efcce..d149107cec 100644
--- a/src/app/index.coffee
+++ b/src/app/index.coffee
@@ -39,6 +39,10 @@ get '/:uid?', (page, model, {uid}, next) ->
 
     #FIXME remove this eventually, part of user schema
     user.setNull 'balance', 2
+    # support legacy Everyauth schema (now using derby-auth, Passport)
+    fb = user.get('auth.facebook')
+    if fb
+      model.set('_loginName', if fb._raw then "#{fb.name.givenName} #{fb.name.familyName}" else fb.name)
     
     # Setup Item Store
     model.set '_items'
diff --git a/views/app/index.html b/views/app/index.html
index 44842750d4..26d1afa761 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -16,14 +16,7 @@
         <a href="/auth/facebook"><img src='/img/facebook-login-register.jpeg' alt="Login / Register With Facebook"/></a>
       {else}
         <div class="btn-group">
-            <button class="btn btn-small">
-                {#if _user.auth.facebook.name.giveName}
-                    {_user.auth.facebook.name.givenName} {_user.auth.facebook.name.familyName}
-                {else}
-                    <!-- support legacy Everyauth schema (now using derby-auth, Passport) -->
-                    {_user.auth.facebook.name}
-                {/}
-            </button>
+            <button class="btn btn-small">{_loginName}</button>
             <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">
                 <span class="caret"></span>
             </button>