diff --git a/classes/catquiz.php b/classes/catquiz.php
index d0c3b75e6..cd6cc7c4d 100644
--- a/classes/catquiz.php
+++ b/classes/catquiz.php
@@ -1979,7 +1979,10 @@ public static function enrol_and_create_message_array(
                 $groupsofcourse = groups_get_all_groups($courseid);
                 foreach ($groupsofcourse as $existinggroup) {
                     foreach ($groupstoenrol[$catscaleid] as $newgroup) {
-                        if ($existinggroup->id == $newgroup) {
+                        if ($existinggroup->name == $newgroup) {
+                            if (groups_is_member($existinggroup->id, $userid)) {
+                                continue;
+                            }
                             $groupmember = groups_add_member($existinggroup->id, $userid);
                             if ($groupmember) {
                                 $data = [];