From 2428413442227464838c481c76e781fdc82cbbf0 Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Sat, 8 Nov 2025 17:57:54 -0800
Subject: [PATCH 1/2] Dont create client

---
 server/routers/olm/handleOlmRegisterMessage.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/routers/olm/handleOlmRegisterMessage.ts b/server/routers/olm/handleOlmRegisterMessage.ts
index d3fa6a58..58d7753d 100644
--- a/server/routers/olm/handleOlmRegisterMessage.ts
+++ b/server/routers/olm/handleOlmRegisterMessage.ts
@@ -42,7 +42,8 @@ export const handleOlmRegisterMessage: MessageHandler = async (context) => {
                 olm.userId,
                 olm.olmId,
                 olm.name || "User Device",
-                doNotCreateNewClient ? true : false
+                // doNotCreateNewClient ? true : false
+                true // for now never create a new client automatically because we create the users clients when they are added to the org
             );
         } catch (err) {
             logger.error(

From 2973b61676d79d031a003287ba5533f5ac86baab Mon Sep 17 00:00:00 2001
From: Owen <owen@txv.io>
Date: Sat, 8 Nov 2025 18:01:42 -0800
Subject: [PATCH 2/2] Fix merge confilct

---
 messages/en-US.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/messages/en-US.json b/messages/en-US.json
index 0e2773c2..1efdb3a1 100644
--- a/messages/en-US.json
+++ b/messages/en-US.json
@@ -2153,14 +2153,9 @@
     "selectedResources": "Selected Resources",
     "enableSelected": "Enable Selected",
     "disableSelected": "Disable Selected",
-<<<<<<< HEAD
     "checkSelectedStatus": "Check Status of Selected",
     "clients": "Clients",
     "accessClientSelect": "Select machine clients",
     "resourceClientDescription": "Machine clients that can access this resource",
     "regenerate": "Regenerate"
 }
-=======
-    "checkSelectedStatus": "Check Status of Selected"
-}
->>>>>>> dev