diff --git a/server/user.js b/server/user.js
index 5b8dfa09b..4f54fa668 100644
--- a/server/user.js
+++ b/server/user.js
@@ -68,6 +68,12 @@ async function saveUser(socket, user) {
 
     io.to(socket.userID).emit("saveUser", bean);
 
+    // If user is deactivated, disconnect his sockets
+    if (!bean.active) {
+        const roomId = typeof id === "number" ? id : parseInt(id, 10);
+        io.in(roomId).disconnectSockets();
+    }
+
     timeLogger.print(`Save user ${user.id}`);
 }
 
diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue
index e93a5159e..82ab098cd 100644
--- a/src/layouts/Layout.vue
+++ b/src/layouts/Layout.vue
@@ -1,6 +1,6 @@
 <template>
     <div :class="classes">
-        <div v-if="! $root.socket.connected && ! $root.socket.firstConnect" class="lost-connection">
+        <div v-if="! $root.socket.connected && ! $root.socket.firstConnect" class="lost-connection" data-testid="lost-connection">
             <div class="container-fluid">
                 {{ $root.connectionErrorMsg }}
                 <div v-if="$root.showReverseProxyGuide">
diff --git a/test/e2e/specs/multiple-users.spec.js b/test/e2e/specs/multiple-users.spec.js
index 058de2187..7940d8e23 100644
--- a/test/e2e/specs/multiple-users.spec.js
+++ b/test/e2e/specs/multiple-users.spec.js
@@ -34,12 +34,11 @@ test.describe("Multiple Users", () => {
 
         // Disable the admin user
         await page.getByTestId("toggle-active-user-admin").click();
-        // Click on the button containing Yes and having btn-danger class
         await page.getByRole("button", {
             name: "Yes",
             exact: true
         }).click();
-        await expect(page.getByText("You are not logged in.")).toBeVisible();
+        await expect(page.getByTestId("lost-connection")).toBeVisible();
 
         // Make sure we're back on the login page after refresh
         await page.reload();
@@ -52,8 +51,8 @@ test.describe("Multiple Users", () => {
 
         // Disable self-user
         await page.goto("./settings/users/edit/2");
-        await expect(page.getByTestId("active-checkbox")).toBeVisible();
         await page.getByTestId("active-checkbox").uncheck();
+        await expect(page.getByTestId("lost-connection")).toBeVisible();
 
         await screenshot(testInfo, page);