diff --git a/src/spamoor/spamoor.star b/src/spamoor/spamoor.star
index 931ac8dbe..8c8d051ad 100644
--- a/src/spamoor/spamoor.star
+++ b/src/spamoor/spamoor.star
@@ -201,10 +201,11 @@ def new_hosts_template_data(
             index + 1, len(str(len(participant_contexts)))
         )
         rpchost = (
-            "group({0},{1},{2})".format(
+            "group({0},{1},{2})name({3})".format(
                 index_str,
                 cl_client.client_name,
                 el_client.client_name,
+                full_name,
             )
             + rpchost
         )