diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/rtc/RTCModule.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/RTCModule.java
index 92e3789..9d3d79c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/rtc/RTCModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/RTCModule.java
@@ -26,6 +26,7 @@
 import com.google.gerrit.server.config.ProjectConfigEntry;
 import com.google.inject.AbstractModule;
 import com.google.inject.Inject;
+import com.google.inject.Scopes;
 
 import com.googlesource.gerrit.plugins.its.base.ItsHookModule;
 import com.googlesource.gerrit.plugins.its.base.its.ItsFacade;
@@ -51,7 +52,7 @@
   protected void configure() {
     if (isConfigPresent(pluginName)) {
       LOG.info("RTC is configured as ITS");
-      bind(ItsFacade.class).to(RTCItsFacade.class);
+      bind(ItsFacade.class).to(RTCItsFacade.class).in(Scopes.SINGLETON);
 
       bind(ProjectConfigEntry.class)
           .annotatedWith(Exports.named("enabled"))
diff --git a/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/RTCClient.java b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/RTCClient.java
index 0d7ad35..3dc52ce 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/RTCClient.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/its/rtc/network/RTCClient.java
@@ -230,6 +230,6 @@
   }
 
   public void setLoggedIn(boolean b) {
-    loggedIn = false;
+    loggedIn = b;
   }
 }