diff --git a/app/assets/javascripts/editor/editor.js.erb b/app/assets/javascripts/editor/editor.js.erb
index 7f2672f5..a9dc6a98 100644
--- a/app/assets/javascripts/editor/editor.js.erb
+++ b/app/assets/javascripts/editor/editor.js.erb
@@ -363,10 +363,15 @@ var CodeOceanEditor = {
   },
 
   publishCodeOceanEvent: function (eventName, contextData) {
+
+    // enhance contextData hash with the user agent
+    contextData['user_agent'] = navigator.userAgent;
+
     var payload = {
       user: {
         type: 'User',
-        uuid: $('#editor').data('user-id')
+        uuid: $('#editor').data('user-id'),
+        external_id: $('#editor').data('user-external-id')
       },
       verb: {
         type: eventName
diff --git a/app/views/exercises/_editor.html.slim b/app/views/exercises/_editor.html.slim
index 0b9d33c1..6b14d3c8 100644
--- a/app/views/exercises/_editor.html.slim
+++ b/app/views/exercises/_editor.html.slim
@@ -1,4 +1,5 @@
-#editor.row data-exercise-id=exercise.id data-message-depleted=t('exercises.editor.depleted') data-message-timeout=t('exercises.editor.timeout', permitted_execution_time: @exercise.execution_environment.permitted_execution_time) data-errors-url=execution_environment_errors_path(exercise.execution_environment) data-submissions-url=submissions_path data-user-id=@current_user.id
+- external_user_id = @current_user.respond_to?(:external_id) ? @current_user.external_id : '' #'tests' #(@current_user.uuid.present? ? @current_user.uuid : '')
+#editor.row data-exercise-id=exercise.id data-message-depleted=t('exercises.editor.depleted') data-message-timeout=t('exercises.editor.timeout',  permitted_execution_time: @exercise.execution_environment.permitted_execution_time) data-errors-url=execution_environment_errors_path(exercise.execution_environment) data-submissions-url=submissions_path data-user-id=@current_user.id data-user-external-id=external_user_id
   div id="sidebar" class=(@exercise.hide_file_tree ? 'sidebar-col-collapsed' : 'sidebar-col') = render('editor_file_tree', exercise: @exercise, files: @files)
   div id='output_sidebar' class='output-col-collapsed' = render('exercises/editor_output')
   div id='frames' class='editor-col'