diff --git a/src/dbacademy/dbhelper/lesson_config.py b/src/dbacademy/dbhelper/lesson_config.py
index 1a0f4fc0..5af35515 100644
--- a/src/dbacademy/dbhelper/lesson_config.py
+++ b/src/dbacademy/dbhelper/lesson_config.py
@@ -248,7 +248,7 @@ def username(self) -> str:
         """
         :return: the current user's name as determined by invoking "SELECT current_user()" in the consumer's workspace.
         """
-        return self.__username
+        return to_clean_lesson_name(self.__username)
 
     @property
     def create_catalog(self) -> bool: