diff --git a/public/img/facebook-login-register.jpeg b/public/img/facebook-login-register.jpeg
new file mode 100644
index 0000000000..32f16d4978
Binary files /dev/null and b/public/img/facebook-login-register.jpeg differ
diff --git a/src/app/index.coffee b/src/app/index.coffee
index e4da0fedce..9ac885bac5 100644
--- a/src/app/index.coffee
+++ b/src/app/index.coffee
@@ -50,11 +50,6 @@ get '/:uidParam?', (page, model, {uidParam}, next) ->
 
 ready (model) ->
     
-  # protocol+host+port = window.location.origin, only webkit. stupid.
-  # also, {_purl} in template won't register, have to use $().val something is messed up
-  pathParts = window.location.toString().split('/')   
-  $('#purl').val "#{pathParts[0]}//#{pathParts[2]}/#{model.get('_userId')}"
-  
   $('[rel=tooltip]').tooltip()
   $('[rel=popover]').popover()
   # FIXME: this isn't very efficient, do model.on set for specific attrs for popover 
diff --git a/src/server/auth.coffee b/src/server/auth.coffee
index 9255b40372..9e2fd49b8f 100644
--- a/src/server/auth.coffee
+++ b/src/server/auth.coffee
@@ -32,8 +32,8 @@ module.exports.newUserAndPurl = () ->
   ## -------- (2) PURL --------
   # eg, http://localhost/{guid}), legacy - will be removed eventually
   # tests if UUID was used (bookmarked private url), and restores that session
-  acceptableUid = require('guid').isGuid(uidParam) or (uidParam in ['3','9'])
-  if acceptableUid && sess.userId!=uidParam
+  acceptableUid = require('guid').isGuid(uidParam) or (uidParam == '3')
+  if acceptableUid && sess.userId!=uidParam && !(sess.habitRpgAuth && sess.habitRpgAuth.facebook)
     # TODO check if in database - issue with accessControl which is on current uid?
     sess.userId = uidParam
 
@@ -73,7 +73,14 @@ module.exports.setupEveryauth = (everyauth) ->
 
       fbUserMetadata
   ).redirectPath "/"
-  
+
+  everyauth.everymodule.handleLogout (req, res) ->
+    if req.session.habitRpgAuth && req.session.habitRpgAuth.facebook
+      req.session.habitRpgAuth.facebook = undefined
+    req.session.userId = undefined
+    req.logout() # The logout method is added for you by everyauth, too
+    @redirect res, @logoutRedirectPath()
+
 module.exports.setupQueries = (store) ->
   ## Setup Queries
   store.query.expose 'users', 'withId', (id) ->
diff --git a/views/app/index.html b/views/app/index.html
index 75dde0fc4c..760416b674 100644
--- a/views/app/index.html
+++ b/views/app/index.html
@@ -12,10 +12,34 @@
   <div id="head">
     <div class='pull-right'>
       {#unless _facebookAuthenticated}
-        <a href="/auth/facebook" class='btn btn-small pull-right'><i class=icon-user></i>Login / Signup With Facebook</a>
+        <a href="/auth/facebook"><img src='/img/facebook-login-register.jpeg' alt="Login / Register With Facebook"/></a>
       {else}
-        <span class=label>{_user.auth.facebook.name}</span>
-      {/}
+        <div class="btn-group">
+            <button class="btn btn-small">{_user.auth.facebook.name}</button>
+            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">
+                <span class="caret"></span>
+            </button>
+            <ul class="dropdown-menu">
+                <li><a href="#settings-modal" data-toggle="modal">Settings</a></li>
+                <!-- FIXME href='/logout' isn't redirecting the page.. window.history? -->
+                <li><a onclick="window.location='/logout'">Logout</a></li>
+            </ul>
+        </div>
+
+        <!-- User Settings Modal -->
+        <div class="modal hide" id="settings-modal" role="dialog">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal">×</button>
+                <h3>Settings</h3>
+            </div>
+            <div class="modal-body">
+                <strong>User ID</strong><br/>
+                <small>Copy this ID for use in third party applications.</small>
+                <pre class=prettyprint>{_user.id}</pre><br/>
+            </div>
+        </div>
+
+        {/}
     </div>