diff --git a/src/plugins/git/gerrit/gerritserver.cpp b/src/plugins/git/gerrit/gerritserver.cpp
index d5fd033d0a2..2a0303015e7 100644
--- a/src/plugins/git/gerrit/gerritserver.cpp
+++ b/src/plugins/git/gerrit/gerritserver.cpp
@@ -283,6 +283,7 @@ bool GerritServer::resolveRoot()
             saveSettings(Valid);
             return true;
         case AuthenticationFailure:
+            return setupAuthentication();
         case CertificateError:
             if (QMessageBox::question(
                         Core::ICore::mainWindow(),
@@ -300,7 +301,6 @@ bool GerritServer::resolveRoot()
                 return false;
             }
             break;
-            return setupAuthentication();
         case PageNotFound:
             if (!ascendPath()) {
                 saveSettings(NotGerrit);