diff --git a/app/lib.py b/app/lib.py
index 525a5a3..59253a4 100644
--- a/app/lib.py
+++ b/app/lib.py
@@ -53,11 +53,14 @@ class OIDCAuthentication(_OIDCAuth):
 
     @property
     def userinfo(self) -> dict:
+        log.debug(flask_session.get('userinfo', {}))
         return flask_session.get('userinfo', {})
 
     @property
     def username(self) -> str:
-        return self.userinfo.get('preferred_username', 'unknown')
+        # This need to be changed after upgrading headscale version
+        # when hs will use the preferred_username field as username
+        return self.email.split('@')[0]
 
     @property
     def email(self) -> str: