diff --git a/lib/emitter/src/Events/EnrolmentCreated.php b/lib/emitter/src/Events/EnrolmentCreated.php
index 1238d07d7dbd4a33ede4ca6b35d40db0e064bd78..dbcb8766f7adeec561e000094ed2a1d66f8e27da 100644
--- a/lib/emitter/src/Events/EnrolmentCreated.php
+++ b/lib/emitter/src/Events/EnrolmentCreated.php
@@ -37,8 +37,9 @@ class EnrolmentCreated extends Event {
             ],
             'object' => $this->read_course($opts),
             'context' => [
-                'instructor' => parent::read($opts)['actor'],
+            	'instructor' => $this->read_user($opts, 'instructor'),
             ],
         ]);
+        
     }
 }
diff --git a/lib/translator/src/Events/EnrolmentCreated.php b/lib/translator/src/Events/EnrolmentCreated.php
index ea9c7648d0212ffc194caf83c2ed947817177578..1c97e7e4c621e0d43f08e3f2b338b98f28594ce0 100644
--- a/lib/translator/src/Events/EnrolmentCreated.php
+++ b/lib/translator/src/Events/EnrolmentCreated.php
@@ -31,8 +31,10 @@ class EnrolmentCreated extends CourseViewed {
             'user_id' => $opts['relateduser']->id,
             'user_url' => $opts['relateduser']->url,
             'user_name' => $opts['relateduser']->fullname,
+            'user_email' => $opts['relateduser']->email,
             'instructor_id' => $opts['user']->id,
             'instructor_url' => $opts['user']->url,
+            'instructor_email' => $opts['user']->email,
             'instructor_name' => $opts['user']->fullname,
         ])];
     }