diff --git a/scripts/bootstrap.py b/scripts/bootstrap.py
index 797c42f..73b0bbf 100644
--- a/scripts/bootstrap.py
+++ b/scripts/bootstrap.py
@@ -1265,19 +1265,19 @@ def main() -> int:
                     sys.stdin.readline()
                     continue
 
-                run_client_script = None
-                candidates = [
-                    target_repo / "run_client.py",
-                    target_repo / "scripts" / "run_client.py",
-                ]
-                for candidate in candidates:
-                    if candidate.exists():
-                        run_client_script = candidate
-                        break
-                if run_client_script is None:
-                    run_client_script = Path(__file__).parent / "run_client.py"
+                run_client_script = Path(__file__).parent / "run_client.py"
+                if not run_client_script.exists():
+                    # Fallback to target repo's copy if our local one is missing
+                    candidates = [
+                        target_repo / "run_client.py",
+                        target_repo / "scripts" / "run_client.py",
+                    ]
+                    for candidate in candidates:
+                        if candidate.exists():
+                            run_client_script = candidate
+                            break
                 
-                if run_client_script.exists():
+                if run_client_script and run_client_script.exists():
                     try:
                         # We pass --repo-root explicitly to the target_repo provided by the user
                         subprocess.check_call(
diff --git a/scripts/run_client.py b/scripts/run_client.py
index a33a446..6894d3f 100644
--- a/scripts/run_client.py
+++ b/scripts/run_client.py
@@ -334,6 +334,7 @@ def install_service_systemd(
     workspace_root: Optional[Path] = None,
 ) -> bool:
     try:
+        print(f"Installing systemd user service via {Path(__file__).resolve()}...")
         systemctl = shutil.which("systemctl")
         if not systemctl:
             print(