diff --git a/thehive/app/org/thp/thehive/services/AuditSrv.scala b/thehive/app/org/thp/thehive/services/AuditSrv.scala
index feb237fc81..75891d625e 100644
--- a/thehive/app/org/thp/thehive/services/AuditSrv.scala
+++ b/thehive/app/org/thp/thehive/services/AuditSrv.scala
@@ -371,9 +371,7 @@ class AuditSteps(raw: GremlinScala[Vertex])(implicit db: Database, schema: Schem
           _.inTo[ShareObservable].inTo[OrganisationShare],
           _.outTo[AlertOrganisation]
         )
-        .inTo[RoleOrganisation]
-        .inTo[UserRole]
-        .has(Key("login") of authContext.userId)
+        .has(Key("name") of authContext.organisation)
     )
   )