diff --git a/package.json b/package.json
index a98a6ffbfb..f466a29874 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "www.habitrpg.com"
   ],
   "scripts": {
-    "start": "server.js"
+    "start": "node server.js"
   },
   "engines": {
     "node": "0.8.x",
diff --git a/src/app/index.coffee b/src/app/index.coffee
index 9786667999..9f6b8cc294 100644
--- a/src/app/index.coffee
+++ b/src/app/index.coffee
@@ -2,6 +2,7 @@ derby = require 'derby'
 {get, view, ready} = derby.createApp module
 derby.use require 'derby-ui-boot'
 derby.use require('../../ui')
+derby.use require('derby-auth/components');
 
 # Custom requires
 moment = require('moment')
@@ -39,9 +40,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
+    if fb = user.get('auth.facebook')
       model.set('_loginName', if fb._raw then "#{fb.name.givenName} #{fb.name.familyName}" else fb.name)
+    else if username = user.get('auth.local.username')
+      model.set('_loginName', username)
     
     # Setup Item Store
     model.set '_items'
diff --git a/views/app/index.html b/views/app/index.html
index 26d1afa761..a3c89d49fd 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -13,7 +13,20 @@
   <div id="head">
     <div class='pull-right'>
       {#unless _loggedIn}
-        <a href="/auth/facebook"><img src='/img/facebook-login-register.jpeg' alt="Login / Register With Facebook"/></a>
+        <a class="btn btn-small btn-info" href="#login-modal" data-toggle="modal">Login / Register</a>
+
+        <app:myModal modalId="login-modal" header="Login / Register">
+            <a href="/auth/facebook"><img src='/img/facebook-login-register.jpeg' alt="Login / Register With Facebook"/></a>
+            <h3>Or</h3>
+            <boot:tabs>
+                <boot:tab title="Login">
+                    <derby-auth:login />
+                </boot:tab>
+                <boot:tab title="Register">
+                    <derby-auth:register />
+                </boot:tab>
+            </boot:tabs>
+        </app:myModal>
       {else}
         <div class="btn-group">
             <button class="btn btn-small">{_loginName}</button>