diff --git a/core/class/layout.class.php b/core/class/layout.class.php
index 8f6fed4..09537c7 100644
--- a/core/class/layout.class.php
+++ b/core/class/layout.class.php
@@ -498,7 +498,7 @@ class layout extends common
         $courses = $this->getData([('course')]);
 		$courses = helper::arraycolumn($courses, 'title', 'SORT_ASC');
         if (
-            $this->getUser('group') < self::GROUP_MEMBER
+            $this->getUser('group') <= self::GROUP_MEMBER
             && $this->getData(['theme', 'menu', 'selectSpace']) === true
         ) {
             if ($courses) {
diff --git a/core/module/course/course.php b/core/module/course/course.php
index f78da74..1942f5a 100644
--- a/core/module/course/course.php
+++ b/core/module/course/course.php
@@ -1300,7 +1300,7 @@ class course extends common
                         ]);
                         break;
                     case self::COURSE_ENROLMENT_SELF_KEY:
-                        if ($this->getInput('courseSwapEnrolmentKey', helper::FILTER_PASSWORD, true) === $this->getData(['course', $courseId, 'enrolmentKey'])) 
+                        if ($this->getInput('courseSwapEnrolmentKey', helper::FILTER_STRING_SHORT, true) === $this->getData(['course', $courseId, 'enrolmentKey'])) 
                         {
                             $this->courseEnrolUser($courseId, $userId);
                             // Stocker la sélection