1 files changed, 7 insertions, 3 deletions
diff --git a/java/com/google/gerrit/server/account/AccountDeactivator.java b/java/com/google/gerrit/server/account/AccountDeactivator.java
index 3465459102..b12e585131 100644
--- a/java/com/google/gerrit/server/account/AccountDeactivator.java
+++ b/java/com/google/gerrit/server/account/AccountDeactivator.java
@@ -57,10 +57,14 @@ public class AccountDeactivator implements Runnable {
 
     @Override
     public void start() {
-      if (!supportAutomaticAccountActivityUpdate) {
-        return;
+      if (schedule.isPresent()) {
+        if (supportAutomaticAccountActivityUpdate) {
+          queue.scheduleAtFixedRate(deactivator, schedule.get());
+        } else {
+          logger.atWarning().log(
+              "Not scheduling AccountDeactivator because auth.autoUpdateAccountActiveStatus is false");
+        }
       }
-      schedule.ifPresent(s -> queue.scheduleAtFixedRate(deactivator, s));
     }
 
     @Override