diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitiles/HttpModule.java b/src/main/java/com/googlesource/gerrit/plugins/gitiles/HttpModule.java
index 44f9814..2d3f448 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitiles/HttpModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitiles/HttpModule.java
@@ -18,6 +18,7 @@
 import com.google.gitiles.GitilesAccess;
 import com.google.gitiles.GitilesServlet;
 import com.google.gitiles.GitilesUrls;
+import com.google.gitiles.GitilesView;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import com.google.inject.name.Named;
@@ -34,10 +35,12 @@
 import java.io.File;
 import java.io.IOException;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 
 class HttpModule extends ServletModule {
-  private static final Logger log = LoggerFactory.getLogger(ServletModule.class);
+  private static final Logger log = LoggerFactory
+      .getLogger(ServletModule.class);
 
   @Override
   protected void configureServlets() {
@@ -48,12 +51,15 @@
 
   @Provides
   @Singleton
-  GitilesServlet getServlet(@Named("gitiles") Config cfg,
-      GitilesUrls urls,
+  GitilesServlet getServlet(@Named("gitiles") Config cfg, GitilesUrls urls,
       GitilesAccess.Factory accessFactory,
-      RepositoryResolver<HttpServletRequest> resolver) {
-    return new GitilesServlet(cfg, null, urls, accessFactory, resolver, null,
-        null, null);
+      RepositoryResolver<HttpServletRequest> resolver,
+      MenuFilter menuFilter) throws ServletException {
+    GitilesServlet s = new GitilesServlet(cfg, null, urls, accessFactory, resolver, null, null, null);
+    for (GitilesView.Type view : GitilesView.Type.values()) {
+      s.addFilter(view, menuFilter);
+    }
+    return s;
   }
 
   @Provides
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitiles/MenuFilter.java b/src/main/java/com/googlesource/gerrit/plugins/gitiles/MenuFilter.java
new file mode 100644
index 0000000..df5438e
--- /dev/null
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitiles/MenuFilter.java
@@ -0,0 +1,72 @@
+// Copyright (C) 2013 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.googlesource.gerrit.plugins.gitiles;
+
+import com.google.common.collect.Lists;
+import com.google.gerrit.server.CurrentUser;
+import com.google.gerrit.server.IdentifiedUser;
+import com.google.gitiles.BaseServlet;
+import com.google.gitiles.GitilesUrls;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+class MenuFilter implements Filter {
+  private final Provider<CurrentUser> userProvider;
+  private final GitilesUrls urls;
+
+  @Inject
+  MenuFilter(Provider<CurrentUser> userProvider, GitilesUrls urls) {
+    this.userProvider = userProvider;
+    this.urls = urls;
+  }
+
+  @Override
+  public void doFilter(ServletRequest request, ServletResponse response,
+      FilterChain chain) throws IOException, ServletException {
+    HttpServletRequest req = (HttpServletRequest) request;
+    CurrentUser user = userProvider.get();
+    List<Object> entries = Lists.newArrayListWithCapacity(2);
+    if (user instanceof IdentifiedUser) {
+      entries
+          .add(BaseServlet.menuEntry(((IdentifiedUser) user).getName(), null));
+      entries.add(BaseServlet.menuEntry("Sign Out", urls.getBaseGerritUrl(req)
+          + "logout/"));
+    } else {
+      entries.add(BaseServlet.menuEntry("Sign In", urls.getBaseGerritUrl(req)
+          + "login/"));
+    }
+    BaseServlet.putSoyData(req, "menuEntries", entries);
+    chain.doFilter(request, response);
+  }
+
+  @Override
+  public void init(FilterConfig filterConfig) throws ServletException {
+  }
+
+  @Override
+  public void destroy() {
+  }
+}