1 files changed, 3 insertions, 4 deletions
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LoginRedirectServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LoginRedirectServlet.java
index 7e043584aa..da6e227674 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LoginRedirectServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LoginRedirectServlet.java
@@ -59,7 +59,7 @@ class LoginRedirectServlet extends HttpServlet {
       token = getToken(req);
     } else {
       final String msg = "Session cookie not available.";
-      token = "SignInFailure," + SignInMode.SIGN_IN + "," + msg;
+      token = "/SignInFailure," + SignInMode.SIGN_IN + "," + msg;
     }
 
     final StringBuilder rdr = new StringBuilder();
@@ -75,11 +75,10 @@ class LoginRedirectServlet extends HttpServlet {
 
   private String getToken(final HttpServletRequest req) {
     String token = req.getPathInfo();
-    if (token != null && token.startsWith("/")) {
-      token = token.substring(1);
-    }
     if (token == null || token.isEmpty()) {
       token = PageLinks.MINE;
+    } else if (!token.startsWith("/")) {
+      token = "/" + token;
     }
     return token;
   }