diff --git a/xmodule/html_block.py b/xmodule/html_block.py
index 9840c3007f92..10f2ed82d642 100644
--- a/xmodule/html_block.py
+++ b/xmodule/html_block.py
@@ -120,14 +120,20 @@ def get_html(self):
""" Returns html required for rendering the block. """
if self.data:
data = self.data
- user_id = (
+ user = (
self.runtime.service(self, 'user')
.get_current_user()
- .opt_attrs.get(ATTR_KEY_DEPRECATED_ANONYMOUS_USER_ID)
+
)
+ user_id = user.opt_attrs.get(ATTR_KEY_DEPRECATED_ANONYMOUS_USER_ID)
if user_id:
data = data.replace("%%USER_ID%%", user_id)
data = data.replace("%%COURSE_ID%%", str(self.scope_ids.usage_id.context_key))
+
+ # EDLYCUSTOM: Replace %%USER_EMAIL%% with user's email in HTML xblock
+ email = user.emails[0]
+ data = data.replace("%%USER_EMAIL%%", email)
+
return data
return self.data