diff --git a/awx/ui/static/less/main-layout.less b/awx/ui/static/less/main-layout.less
index 856b3264b4..bd14750072 100644
--- a/awx/ui/static/less/main-layout.less
+++ b/awx/ui/static/less/main-layout.less
@@ -44,4 +44,13 @@ body {
 
 .group-breadcrumbs {
     margin-bottom: 20px;
+}
+
+@media (min-width: 1200px) {
+    #main-menu-container {
+        #account-menu {
+            margin-right: 60px;
+            float: right;
+        }
+    }
 }
\ No newline at end of file
diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html
index 96c5602348..25ce26ff35 100644
--- a/awx/ui/templates/ui/index.html
+++ b/awx/ui/templates/ui/index.html
@@ -193,14 +193,16 @@
                         <li id="job_templates"><a href="#job_templates" id="main_job_templates_link">Job Templates</a></li>
                         <li id="jobs"><a href="#jobs" id="main_jobs_link">Jobs</a></li>
                     </ul>
-                    <ul class="nav navbar-nav pull-right">
+                    <ul class="nav navbar-nav" id="account-menu">
+                        <li id="socket-beacon"></li>
                         <li class="dropdown">
                             <a href="" id="account-menu-link" data-toggle="dropdown">Account <span class="caret"></span></a>
                             <ul class="dropdown-menu">
-                               <li><a href="">Logout</a></li>
-                               <li><a href="">License</a></li>
-                               <li><a href="">Contact Support</a></li>
-                               <li><a href="">About</a></li>
+                               <li ng-show="current_user.username != null && current_user.username != undefined">
+                                   <a id="main_view_user" href="" ng-click="viewCurrentUser()" ng-bind="'Hello! ' + current_user.username"></a></li>
+                               <li><a id="main_logout" href="#/logout">Logout</a></li>
+                               <li><a id="main_view_license" href="" ng-click="viewLicense()">View License</a></li>
+                               <li><a id="main_contact_support" target="_blank" href="https://ansibleworks.zendesk.com/anonymous_requests/new">Contact Support</a></li>
                             </ul>
                         </li>
                     </ul>