diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css
index dca3cd948..23092eda0 100644
--- a/netbox/project-static/css/base.css
+++ b/netbox/project-static/css/base.css
@@ -35,6 +35,13 @@ footer p {
     margin: 20px 0;
 }
 
+/* Hide the username in the navigation menu on displays less than 1400px wide */
+@media (max-width: 1399px) {
+    #navbar_user {
+        display: none;
+    }
+}
+
 /* Collapse the nav menu on displays less than 1200px wide */
 @media (max-width: 1199px) {
     .navbar-header {
@@ -72,12 +79,8 @@ footer p {
     .collapse.in {
         display:block !important;
     }
-}
-
-/* Hide the nav search bar on displays less than 1600px wide */
-@media (max-width: 1599px) {
-    #navbar_search {
-        display: none;
+    #navbar_user {
+        display: inline;
     }
 }
 
diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html
index c1dc9dc67..dd811fb54 100644
--- a/netbox/templates/inc/nav_menu.html
+++ b/netbox/templates/inc/nav_menu.html
@@ -379,7 +379,9 @@
                 {% if request.user.is_authenticated %}
                     <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" title="{{ request.user }}" role="button" aria-haspopup="true" aria-expanded="false">
-                            {{ request.user|truncatechars:"30" }} <span class="caret"></span>
+                            <i class="fa fa-user"></i>
+                            <span id="navbar_user">{{ request.user|truncatechars:"30" }}</span>
+                            <span class="caret"></span>
                         </a>
                         <ul class="dropdown-menu">
                             <li><a href="{% url 'user:profile' %}"><i class="fa fa-user"></i> Profile</a></li>