diff --git a/templates/dashboard.html b/templates/dashboard.html
index 7f98d268..722cfa3d 100644
--- a/templates/dashboard.html
+++ b/templates/dashboard.html
@@ -1,4 +1,4 @@
-{{define "content"}} {{template "nav"}}
+{{define "content"}} {{template "nav" .User}}
 <div class="jumbotron">
     <div class="container" style="text-align:center;">
         <h1 class="sans header">
diff --git a/templates/nav.html b/templates/nav.html
index 16dbc708..97b5baa2 100644
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -13,9 +13,15 @@
         <div class="navbar-collapse collapse">
             <ul class="nav navbar-nav navbar-right">
                 <li>
-                    <a id="navbar-login" href="/login">
+                    {{if .}}
+                    <a href="/settings">
+                        <button type="button" class="btn btn-primary"><i class="fa fa-user"></i> {{.Username}}</button>
+                    </a>
+                    {{else}}
+                    <a href="/login">
                         <button type="button" class="btn btn-primary">Login</button>
                     </a>
+                    {{end}}
                 </li>
             </ul>
         </div>