diff --git a/e107_themes/bootstrap/style.css b/e107_themes/bootstrap/style.css
index 22ce7b706..0078ca4ff 100644
--- a/e107_themes/bootstrap/style.css
+++ b/e107_themes/bootstrap/style.css
@@ -5,7 +5,12 @@ body 						{ padding-bottom: 40px; }
 	
 body						{ padding-top: 75px;  }
 
-} 
+}
+
+.navbar-inverse .brand, .navbar-inverse .nav > li > a.no-block {
+    display: inline;
+    padding: 10px 0px;
+}
 
 .well 						{ padding:10px; }
 footer						{ padding:60px }
diff --git a/e107_themes/bootstrap/theme.php b/e107_themes/bootstrap/theme.php
index c7023d22d..54e4eab25 100644
--- a/e107_themes/bootstrap/theme.php
+++ b/e107_themes/bootstrap/theme.php
@@ -154,10 +154,10 @@ $HEADER['default'] = '
           </a>
           <a class="brand" href="'.SITEURL.'">{SITENAME}</a>
           <div class="nav-collapse collapse">
-            <p class="navbar-text pull-right">
-             '.(!USERID ? '<a class="navbar-link" href="'.e_LOGIN.'">Sign in</a>': 'Logged in as <a href="#" class="navbar-link">'.USERNAME.'</a>').'
-            </p>
            {NAVIGATION=main}
+            <ul class="nav nav-pills pull-right">
+                <li class="dropdown">'.(!USERID ? '<a class="dropdown-toggle" role="button" href="'.e_LOGIN.'">Sign in</a>': '<span class="navbar-text">Logged in as</span> <a class="dropdown-toggle no-block" role="button" href="user.php?id.'.USERID.'">'.USERNAME.'</a>').'</li>
+            </ul>
           </div><!--/.nav-collapse -->
         </div>
       </div>