diff --git a/app/client/views/header/header.coffee b/app/client/views/header/header.coffee
index 1dc9c22..1372950 100644
--- a/app/client/views/header/header.coffee
+++ b/app/client/views/header/header.coffee
@@ -1,16 +1,21 @@
 Template.header.helpers
   activeRouteClass: (routeNames...)->
     args = Array::slice.call(routeNames, 0)
     args.pop()
     active = _.any(args, (name) ->
       Router.current() and Router.current().route.getName() is name
     )
     return "active" if active
     ""
 
+  username: (user) ->
+    getUserDescription(user)
 
 Template.header.events
   #this is needed to trigger hashchange
   "click #patientsA": (evt) ->
     window.location.hash = ""
     true
+
+  "click #logoutUser": (evt) ->
+    AccountsTemplates.logout()
diff --git a/app/client/views/header/header.html b/app/client/views/header/header.html
index 94e4f48..671b1ad 100644
--- a/app/client/views/header/header.html
+++ b/app/client/views/header/header.html
@@ -1,63 +1,77 @@
 <template name="header">
 <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
     <div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse">
         <span class="sr-only">Toggle navigation</span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
       <a class="navbar-brand" href="{{pathFor 'patients'}}">epiph </a>
     </div>
 
     <!-- Collect the nav links, forms, and other content for toggling -->
     <div id="navbar-collapse" class="collapse navbar-collapse">
       <ul class="nav navbar-nav">
         {{#if currentUser}}
         {{#if isInRole 'admin, caseManager'}}
         <li class="{{activeRouteClass 'patients'}}">
           <a href="{{pathFor 'patients'}}" id="patientsA">
             Patients &amp; Questioning
           </a>
         </li>
         {{/if}}
         {{/if}}
         {{#if isInRole 'admin'}}
         <li class="{{activeRouteClass 'questionnaires' 'editQuestionnaire' 'translateQuestionnaire'}}">
           <a href="{{pathFor 'questionnaires'}}">
             Questionnaires
           </a>
         </li>
         <li class="{{activeRouteClass 'studies' 'editStudy'}}">
           <a href="{{pathFor 'studies'}}">
             Studies
           </a>
         </li>
         <li class="{{activeRouteClass 'export'}}">
           <a href="{{pathFor 'export'}}">
             Export
           </a>
         </li>
         {{/if}}
       </ul>
       <ul class="nav navbar-nav navbar-right">
         {{#if isInRole 'admin'}}
         <li class="{{activeRouteClass 'activities'}}">
           <a href="{{pathFor 'activities'}}">
             Activities
           </a>
         </li>
         <li class="{{activeRouteClass 'users'}}">
           <a href="{{pathFor 'users'}}">
             Users
           </a>
         </li>
         {{/if}}
-        {{> atNavButton}}
+        {{#if currentUser}}
+          <li class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown">{{ username(currentUser) }} <span class="caret"></span></a>
+              <ul class="dropdown-menu">
+                <li><a href="{{pathFor 'atChangePwd'}}">Change password</a></li>
+                <li><a id="logoutUser">Sign out</a></li>
+              </ul>
+          </li>
+        {{else}}
+          <li>
+            <a href="{{pathFor 'atSignIn'}}">
+              Sign in/Join
+            </a>
+          </li>
+        {{/if}}
       </ul>
     </div><!-- /.navbar-collapse -->
   </div><!-- /.container-fluid -->
 </nav>
 </template>