diff --git a/client/spacetime/Spacetime.cs b/client/spacetime/Spacetime.cs
index 6e7449a..8a94b95 100644
--- a/client/spacetime/Spacetime.cs
+++ b/client/spacetime/Spacetime.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Text.RegularExpressions;
 using Godot;
 using SpacetimeDB;
 using SpacetimeDB.Types;
@@ -33,10 +34,25 @@ public class Spacetime
 
     private static Spacetime _instance;
 
+    string GetClientArg()
+    {
+        foreach (string arg in OS.GetCmdlineUserArgs())
+        {
+            GD.Print(arg);
+            if (new Regex("--client=.+").IsMatch(arg))
+            {
+                return arg.Split("=")[1];
+            }
+        }
+        return null;
+    }
+
     public Spacetime(string host, string dbName)
     {
+        string client = GetClientArg() ?? "massive";
+
         // Initialize the `AuthToken` module
-        AuthToken.Init(".spacetime_csharp_quickstart");
+        AuthToken.Init($".spacetime/{client}");
 
         Connection = DbConnection
             .Builder()