diff --git a/lib/completionlib.php b/lib/completionlib.php
index 94cd4b0c924..46bad39d87a 100644
--- a/lib/completionlib.php
+++ b/lib/completionlib.php
@@ -1424,14 +1424,15 @@ class completion_info {
         $fieldssql = $userfieldsapi->get_sql('u', true);
         $sql = 'SELECT u.id, u.idnumber ' . $fieldssql->selects;
         $sql .= ' FROM (' . $enrolledsql . ') eu JOIN {user} u ON u.id = eu.id';
-        $sql .= $fieldssql->joins;
-        $params = array_merge($params, $fieldssql->params);
 
         if ($where) {
             $sql .= " AND $where";
             $params = array_merge($params, $whereparams);
         }
 
+        $sql .= $fieldssql->joins;
+        $params = array_merge($params, $fieldssql->params);
+
         if ($sort) {
             $sql .= " ORDER BY $sort";
         }