diff --git a/src/main/webapp/WEB-INF/view/index.jsp b/src/main/webapp/WEB-INF/view/index.jsp
index 03a078617..372dcff55 100644
--- a/src/main/webapp/WEB-INF/view/index.jsp
+++ b/src/main/webapp/WEB-INF/view/index.jsp
@@ -21,6 +21,11 @@
 		<div class="navbar-inner">
 			<div class="container">
 				<p class="navbar-text pull-right">
+					<c:if test="${!empty username}">
+					<s:link href="/login/logout" styleClass="logout-link">
+						<bean:message key="labels.logout" />
+					</s:link>
+					</c:if>
 					<s:link href="/help" styleClass="help-link">
 						<bean:message key="labels.index_help" />
 					</s:link>
diff --git a/src/main/webapp/WEB-INF/view/search.jsp b/src/main/webapp/WEB-INF/view/search.jsp
index 4ab6de6d9..688ba6848 100644
--- a/src/main/webapp/WEB-INF/view/search.jsp
+++ b/src/main/webapp/WEB-INF/view/search.jsp
@@ -79,6 +79,10 @@
 				<c:if test="${!empty username}">
 				<p class="username">
 					<bean:message key="labels.searchheader_username" arg0="${f:h(username)}" />
+					|
+					<s:link href="/login/logout" styleClass="logout-link">
+						<bean:message key="labels.logout" />
+					</s:link>
 				</p>
 				</c:if>
 			</div>
diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css
index fd0690290..aeae4c6b8 100644
--- a/src/main/webapp/css/style.css
+++ b/src/main/webapp/css/style.css
@@ -22,11 +22,15 @@ h3 {
   font-size: 18px;
 }
 
-.navbar .help-link {
+.navbar .logout-link {
+    margin-right: 10px;
+}
+
+.navbar .logout-link, .navbar .help-link {
 	color: #ffffff;
 }
 
-.navbar .help-link:hover {
+.navbar .logout-link:hover, .navbar .help-link:hover {
 	color: #08c;
 	text-decoration: none;
 }