diff --git a/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php b/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
index 57ec33cdd..2974fb875 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Aggregator/AgentAggregator.php
@@ -41,7 +41,7 @@ final class AgentAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         if (!in_array('caluser', $qb->getAllAliases(), true)) {
-            $qb->join('cal.user', 'caluser');
+            $qb->join('cal.mainUser', 'caluser');
         }
 
         $qb->addSelect('caluser.id AS agent_aggregator');
diff --git a/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php b/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
index 263b1e160..fe33c1210 100644
--- a/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
+++ b/src/Bundle/ChillCalendarBundle/Export/Filter/AgentFilter.php
@@ -37,7 +37,7 @@ class AgentFilter implements FilterInterface
     public function alterQuery(QueryBuilder $qb, $data)
     {
         $where = $qb->getDQLPart('where');
-        $clause = $qb->expr()->in('cal.user', ':agents');
+        $clause = $qb->expr()->in('cal.mainUser', ':agents');
 
         if ($where instanceof Andx) {
             $where->add($clause);