diff --git a/src/main/java/com/google/gerrit/server/http/HttpLoginServlet.java b/src/main/java/com/google/gerrit/server/http/HttpLoginServlet.java
index 952eab54f2..91565e623c 100644
--- a/src/main/java/com/google/gerrit/server/http/HttpLoginServlet.java
+++ b/src/main/java/com/google/gerrit/server/http/HttpLoginServlet.java
@@ -99,7 +99,7 @@ class HttpLoginServlet extends HttpServlet {
     final StringBuilder rdr = new StringBuilder();
     rdr.append(urlProvider.get());
     rdr.append('#');
-    if (arsp.isNew()) {
+    if (arsp.isNew() && !token.startsWith(Link.REGISTER + ",")) {
       rdr.append(Link.REGISTER);
       rdr.append(',');
     }
diff --git a/src/main/java/com/google/gerrit/server/openid/OpenIdServiceImpl.java b/src/main/java/com/google/gerrit/server/openid/OpenIdServiceImpl.java
index 2b0e07b6ef..cc9e58229e 100644
--- a/src/main/java/com/google/gerrit/server/openid/OpenIdServiceImpl.java
+++ b/src/main/java/com/google/gerrit/server/openid/OpenIdServiceImpl.java
@@ -335,7 +335,7 @@ class OpenIdServiceImpl implements OpenIdService {
     final StringBuilder rdr = new StringBuilder();
     rdr.append(urlProvider.get());
     rdr.append('#');
-    if (isNew) {
+    if (isNew && !token.startsWith(Link.REGISTER + ",")) {
       rdr.append(Link.REGISTER);
       rdr.append(',');
     }