diff --git a/vektra-learn/src/vektra_learn/service.py b/vektra-learn/src/vektra_learn/service.py
index cf872643..dcc276ee 100644
--- a/vektra-learn/src/vektra_learn/service.py
+++ b/vektra-learn/src/vektra_learn/service.py
@@ -191,6 +191,7 @@ async def generate_token(
             "dashboard_token_generated",
             student_id=req.student_id,
             course_id=req.course_id,
+            namespace=req.namespace or req.course_id,
         )
         return TokenResponse(token=token, expires_at=expires_at)