diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 8f79ce33..95fdd0a0 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -15,6 +15,7 @@
 use OCA\GlobalSiteSelector\GlobalSiteSelector;
 use OCA\GlobalSiteSelector\Listeners\AddContentSecurityPolicyListener;
 use OCA\GlobalSiteSelector\Listeners\DeletingUser;
+use OCA\GlobalSiteSelector\Listeners\UserChanged;
 use OCA\GlobalSiteSelector\Listeners\UserCreated;
 use OCA\GlobalSiteSelector\Listeners\UserDeleted;
 use OCA\GlobalSiteSelector\Listeners\UserLoggedOut;
@@ -36,6 +37,7 @@
 use OCP\Server;
 use OCP\User\Events\BeforeUserDeletedEvent;
 use OCP\User\Events\BeforeUserLoggedInEvent;
+use OCP\User\Events\UserChangedEvent;
 use OCP\User\Events\UserCreatedEvent;
 use OCP\User\Events\UserDeletedEvent;
 use OCP\User\Events\UserLoggedOutEvent;
@@ -80,6 +82,7 @@ public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(BeforeUserDeletedEvent::class, DeletingUser::class);
 		$context->registerEventListener(UserDeletedEvent::class, UserDeleted::class);
 		$context->registerEventListener(UserLoggedOutEvent::class, UserLoggedOut::class);
+		$context->registerEventListener(UserChangedEvent::class, UserChanged::class);
 
 		$context->registerSetupCheck(LongJwtKeySetupCheck::class);
 
diff --git a/lib/Controller/SlaveController.php b/lib/Controller/SlaveController.php
index 24c60be3..dfd572ee 100644
--- a/lib/Controller/SlaveController.php
+++ b/lib/Controller/SlaveController.php
@@ -9,6 +9,7 @@
 namespace OCA\GlobalSiteSelector\Controller;
 
 use OC\Authentication\Token\IProvider;
+use OC\User\DisabledUserException;
 use OCA\GlobalSiteSelector\AppInfo\Application;
 use OCA\GlobalSiteSelector\Exceptions\LocalFederatedShareException;
 use OCA\GlobalSiteSelector\Exceptions\MasterUrlException;
@@ -63,6 +64,7 @@ public function __construct(
 		private readonly IUserManager $userManager,
 		private readonly UserBackend $userBackend,
 		private readonly ISession $session,
+		private readonly Slave $slave,
 		private readonly SlaveService $slaveService,
 		private readonly GlobalScaleService $globalScaleService,
 		private readonly GlobalShareService $globalShareService,
@@ -159,6 +161,9 @@ public function autoLogin(string $jwt): RedirectResponse {
 				if (!($user instanceof IUser)) {
 					throw new \InvalidArgumentException('User is not valid');
 				}
+				if (!$user->isEnabled()) {
+					throw new DisabledUserException('Account disabled');
+				}
 				$user->updateLastLoginTimestamp();
 
 				$this->session->set('globalScale.userData', $options);
@@ -191,6 +196,12 @@ public function autoLogin(string $jwt): RedirectResponse {
 			$response = new RedirectResponse($masterUrl);
 			$response->throttle();
 			return $response;
+		} catch (DisabledUserException $e) {
+			// user is disabled, remove from lookup server
+			$params = ['uid' => $uid];
+			$this->slave->preDeleteUser($params);
+			$this->slave->deleteUser($params);
+			return new RedirectResponse($masterUrl);
 		} catch (\Exception $e) {
 			$this->logger->warning('issue during login process', ['exception' => $e]);
 			$response = new RedirectResponse($masterUrl);
diff --git a/lib/Listeners/UserChanged.php b/lib/Listeners/UserChanged.php
new file mode 100644
index 00000000..dfa4a076
--- /dev/null
+++ b/lib/Listeners/UserChanged.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\GlobalSiteSelector\Listeners;
+
+use OCA\GlobalSiteSelector\GlobalSiteSelector;
+use OCA\GlobalSiteSelector\Slave;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\User\Events\UserChangedEvent;
+
+/**
+ * @template-implements IEventListener<UserChangedEvent>
+ */
+class UserChanged implements IEventListener {
+
+	public function __construct(
+		private GlobalSiteSelector $globalSiteSelector,
+		private Slave $slave,
+	) {
+	}
+
+	public function handle(Event $event): void {
+		if (!$event instanceof UserChangedEvent) {
+			return;
+		}
+
+		if (!$this->globalSiteSelector->isSlave()) {
+			return;
+		}
+
+		if ($event->getFeature() !== 'enabled') {
+			return;
+		}
+
+		$params = ['uid' => $event->getUser()->getUID()];
+
+		if ($event->getValue() === false) {
+			// user was disabled, remove from lookup server
+			$this->slave->preDeleteUser($params);
+			$this->slave->deleteUser($params);
+		} else {
+			// user was enabled, add to lookup server
+			$this->slave->createUser($params);
+		}
+	}
+}
diff --git a/lib/Slave.php b/lib/Slave.php
index fe764ae7..09df9f2f 100644
--- a/lib/Slave.php
+++ b/lib/Slave.php
@@ -158,18 +158,28 @@ public function batchUpdate(): void {
 		foreach ($backends as $backend) {
 			$limit = 200;
 			$offset = 0;
-			$usersData = [];
 			do {
-
+				$usersToAdd = [];
+				$usersToRemove = [];
 				$users = $backend->getUsers('', $limit, $offset);
 				foreach ($users as $uid) {
 					$user = $this->userManager->get($uid);
-					if ($user !== null) {
-						$usersData[$user->getCloudId()] = $this->slaveService->getAccountData($user);
+					if ($user === null) {
+						continue;
+					}
+					if ($user->isEnabled()) {
+						$usersToAdd[$user->getCloudId()] = $this->slaveService->getAccountData($user);
+					} else {
+						$usersToRemove[] = $user->getCloudId();
 					}
 				}
 				$offset += $limit;
-				$this->addUsers($usersData);
+				if ($usersToAdd !== []) {
+					$this->addUsers($usersToAdd);
+				}
+				if ($usersToRemove !== []) {
+					$this->removeUsers($usersToRemove);
+				}
 			} while (count($users) >= $limit);
 		}
 	}
diff --git a/psalm.xml b/psalm.xml
index 72b23f2c..f6184379 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -58,6 +58,8 @@
 		<file name="tests/stubs/oc_server.php" />
 		<file name="tests/stubs/oc_servercontainer.php" />
 		<file name="tests/stubs/oc_settings_authorizedgroupmapper.php" />
+		<file name="tests/stubs/oc_user_disableduserexception.php" />
+		<file name="tests/stubs/oc_user_loginexception.php" />
 		<file name="tests/stubs/oc_user_user.php" />
 		<file name="tests/stubs/oca_circles_circlesmanager.php" />
 		<file name="tests/stubs/oca_circles_circlesqueryhelper.php" />
diff --git a/tests/stubs/oc_user_disableduserexception.php b/tests/stubs/oc_user_disableduserexception.php
new file mode 100644
index 00000000..c29ce7cd
--- /dev/null
+++ b/tests/stubs/oc_user_disableduserexception.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+namespace OC\User;
+
+class DisabledUserException extends LoginException {
+}
diff --git a/tests/stubs/oc_user_loginexception.php b/tests/stubs/oc_user_loginexception.php
new file mode 100644
index 00000000..632321e7
--- /dev/null
+++ b/tests/stubs/oc_user_loginexception.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+namespace OC\User;
+
+class LoginException extends \Exception {
+}
diff --git a/tests/unit/lib/Controller/SlaveControllerTest.php b/tests/unit/lib/Controller/SlaveControllerTest.php
index 2d85e7ff..f314715a 100644
--- a/tests/unit/lib/Controller/SlaveControllerTest.php
+++ b/tests/unit/lib/Controller/SlaveControllerTest.php
@@ -15,6 +15,7 @@
 use OCA\GlobalSiteSelector\Service\GlobalScaleService;
 use OCA\GlobalSiteSelector\Service\GlobalShareService;
 use OCA\GlobalSiteSelector\Service\SlaveService;
+use OCA\GlobalSiteSelector\Slave;
 use OCA\GlobalSiteSelector\TokenHandler;
 use OCA\GlobalSiteSelector\UserBackend;
 use OCA\GlobalSiteSelector\Vendor\Firebase\JWT\JWT;
@@ -39,6 +40,7 @@ class SlaveControllerTest extends TestCase {
 	private IUserManager $userManager;
 	private UserBackend $userBackend;
 	private ISession $session;
+	private Slave $slave;
 	private GlobalScaleService $globalScaleService;
 	private GlobalShareService $globalShareService;
 	private SlaveService $slaveService;
@@ -61,6 +63,7 @@ public function setUp(): void {
 		$this->userBackend = $this->getMockBuilder(UserBackend::class)
 			->disableOriginalConstructor()->getMock();
 		$this->session = $this->createMock(ISession::class);
+		$this->slave = $this->createMock(Slave::class);
 		$this->slaveService = $this->createMock(SlaveService::class);
 		$this->globalScaleService = $this->createMock(GlobalScaleService::class);
 		$this->globalShareService = $this->createMock(GlobalShareService::class);
@@ -86,6 +89,7 @@ private function getInstance(array $mockMathods = []) {
 					$this->userManager,
 					$this->userBackend,
 					$this->session,
+					$this->slave,
 					$this->slaveService,
 					$this->globalScaleService,
 					$this->globalShareService,