diff --git a/packages/hagrid/hagrid/orchestra.py b/packages/hagrid/hagrid/orchestra.py
index 2fee2c09ae6..542739b304d 100644
--- a/packages/hagrid/hagrid/orchestra.py
+++ b/packages/hagrid/hagrid/orchestra.py
@@ -166,7 +166,7 @@ def __init__(
     def client(self) -> Any:
         if self.port:
             sy = get_syft_client()
-            return sy.login(url=self.url, port=self.port)  # type: ignore
+            return sy.login_as_guest(url=self.url, port=self.port)  # type: ignore
         elif self.deployment_type == DeploymentType.PYTHON:
             return self.python_node.get_guest_client(verbose=False)  # type: ignore
         else:
diff --git a/packages/syft/src/syft/client/client.py b/packages/syft/src/syft/client/client.py
index f2aa5445347..4f6b6823886 100644
--- a/packages/syft/src/syft/client/client.py
+++ b/packages/syft/src/syft/client/client.py
@@ -682,6 +682,12 @@ def login(
             credentials=signing_key,
         )
 
+        client.__logged_in_user = email
+
+        if user_private_key is not None:
+            client.__user_role = user_private_key.role
+            client.__logged_in_username = client.users.get_current_user().name
+
         if signing_key is not None:
             print(
                 f"Logged into <{client.name}: {client.metadata.node_side_type.capitalize()} side "