diff --git a/admin/track-and-disable-inactive-users-1.0.groovy b/admin/track-and-disable-inactive-users-1.1.groovy
similarity index 94%
rename from admin/track-and-disable-inactive-users-1.0.groovy
rename to admin/track-and-disable-inactive-users-1.1.groovy
index 33ae335..2131aa4 100644
--- a/admin/track-and-disable-inactive-users-1.0.groovy
+++ b/admin/track-and-disable-inactive-users-1.1.groovy
@@ -145,6 +145,9 @@
   Accounts accounts
 
   @Inject
+  ServiceUserClassifier serviceUserClassifier
+
+  @Inject
   @Named(TrackActiveUsersCache.NAME)
   Cache<Integer, Long> trackActiveUsersCache
 
@@ -152,7 +155,11 @@
   void start() {
     def currentMinutes = MILLISECONDS.toMinutes(System.currentTimeMillis())
     accounts.all()
-        .findAll { it.account().isActive() && !trackActiveUsersCache.getIfPresent(it.account().id().get()) }
+        .findAll {
+          it.account().isActive()
+              && !serviceUserClassifier.isServiceUser(it.account().id()
+              && !trackActiveUsersCache.getIfPresent(it.account().id().get())
+        }
         .each { trackActiveUsersCache.put(it.account().id().get(), currentMinutes) }
   }