diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag
index 48767c821..2a93de803 100644
--- a/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag
@@ -70,25 +70,22 @@
 							</c:otherwise>
 						</c:choose>
 	
+					</ul>
 	
 						<security:authorize access="hasRole('ROLE_USER')">
-	
-							<li class="dropdown hidden-desktop"><a href="#"
-								class="dropdown-toggle" data-toggle="dropdown">Action <b
-									class="caret"></b></a>
-								<ul class="dropdown-menu">
-									<o:actionmenu />
-								</ul></li>
+		
+							<ul class="nav hidden-desktop">
+							<o:actionmenu />
+							</ul>
 	
 						</security:authorize>
 	
-					</ul>
-					<ul class="nav pull-right">
+					<div class="nav pull-right">
 	                    <security:authorize access="hasRole('ROLE_USER')">
 						<div class="btn-group">
 							<a class="btn btn-primary btn-small dropdown-toggle" data-toggle="dropdown" href=""><i class="icon-user icon-white"></i> ${ shortName } <span class="caret"></span></a>
-							<ul class="dropdown-menu">
-								<li><a>${ longName }</a></li>
+							<ul class="dropdown-menu pull-right">
+								<li><a href="manage/#user/profile">${ longName }</a></li>
 								<li class="divider"></li>
 								<li><a href="logout"><i class="icon-remove"></i> Log out</a></li>
 							</ul>
@@ -97,7 +94,7 @@
 	                    <security:authorize access="!hasRole('ROLE_USER')">
 	                    	<a class="btn btn-primary btn-small" href="login"><i class="icon-user icon-white"></i> Log in</a>
 	                    </security:authorize>
-	                </ul>
+	                </div>
 	                    
 	            </div><!--/.nav-collapse -->
 			</c:if>