diff --git a/matrix_keycloak_bot.py b/matrix_keycloak_bot.py
index b809bc3..cae75bc 100644
--- a/matrix_keycloak_bot.py
+++ b/matrix_keycloak_bot.py
@@ -429,14 +429,14 @@ async def main():
                 "device_id": client.device_id
             }, f)
 
-    # Ensure an Olm crypto account exists in the store BEFORE initializing OlmMachine
-    account = await crypto_store.get_account()
+    # Ensure an Olm crypto account exists in the store for this specific mxid BEFORE initializing OlmMachine
+    account = await crypto_store.get_account(client.mxid)
     if not account:
         log.info("Creating new Olm account...")
         account = OlmAccount()
-        await crypto_store.put_account(account)
+        await crypto_store.put_account(account, client.mxid)
 
-    # Initialize OlmMachine after the account is guaranteed to exist
+    # Initialize OlmMachine after the account is guaranteed to exist under the correct key
     client.crypto = OlmMachine(client, crypto_store, state_store)
 
     # Register Event Handlers