diff --git a/backend/managers/AuthManager.py b/backend/managers/AuthManager.py
index 246803cc..4e8ba747 100644
--- a/backend/managers/AuthManager.py
+++ b/backend/managers/AuthManager.py
@@ -62,7 +62,7 @@ def verify_email_token(token):
     SALT = "email-confirmation-salt"
     serializer = URLSafeTimedSerializer(SECRET_KEY)
     try:
-        user_id = serializer.loads(token, salt=SALT, max_age=900)
+        user_id = serializer.loads(token, salt=SALT, max_age=900) # token is valid for 15 minutes
     except SignatureExpired:
         return None 
     except BadSignature:
@@ -297,7 +297,7 @@ async def webauthn_login(self, challenge: str, email_id:str, response):
                 return None
             
             cb = CasbinRoleManager()
-            role = cb.get_user_role(user.id, "ADMIN_PORTAL")
+            role = cb.get_user_roles(user.id, "ADMIN_PORTAL")
             payload = {
                 "sub": user.id,
                 "role": role,
diff --git a/backend/managers/CasbinRoleManager.py b/backend/managers/CasbinRoleManager.py
index f8637154..3be3007e 100644
--- a/backend/managers/CasbinRoleManager.py
+++ b/backend/managers/CasbinRoleManager.py
@@ -67,6 +67,6 @@ def get_admin_users(self, domain):
     def get_roles_for_user_in_domain(self, user_id, domain):
         return self.enforcer.get_roles_for_user_in_domain(user_id, domain)
     
-    def get_user_role(self, user_id, domain):
+    def get_user_roles(self, user_id, domain):
         return ",".join(self.enforcer.get_roles_for_user_in_domain(user_id, domain))
         
diff --git a/backend/managers/UsersManager.py b/backend/managers/UsersManager.py
index 39b75946..fd70e87f 100644
--- a/backend/managers/UsersManager.py
+++ b/backend/managers/UsersManager.py
@@ -48,7 +48,7 @@ async def retrieve_user(self, id):
             result = await session.execute(select(User).filter(User.id == id))
             user = result.scalar_one_or_none()
             cb = CasbinRoleManager()
-            return UserSchema(id=user.id, name=user.name, email=user.email, role=cb.get_user_role(user.id, "ADMIN_PORTAL")) if user else None
+            return UserSchema(id=user.id, name=user.name, email=user.email, role=cb.get_user_roles(user.id, "ADMIN_PORTAL")) if user else None
 
     async def retrieve_users(self, offset=0, limit=100, sort_by=None, sort_order='asc', filters=None):
         async with db_session_context() as session:
@@ -73,7 +73,7 @@ async def retrieve_users(self, offset=0, limit=100, sort_by=None, sort_order='as
                 id=user.id,
                 name=user.name,
                 email=user.email,
-                role=cb.get_user_role(user.id, "ADMIN_PORTAL")
+                role=cb.get_user_roles(user.id, "ADMIN_PORTAL")
             ) for user in result.scalars().all()]
 
             # Get total count
diff --git a/common/mail.py b/common/mail.py
index 2f98142f..c29719f3 100644
--- a/common/mail.py
+++ b/common/mail.py
@@ -10,7 +10,7 @@ async def send(to, subject, body_text, body_html = None):
 
     # Retrieve SMTP server details from environment variables
     smtp_host = get_env_key('PAIOS_SMTP_HOST', 'localhost')
-    smtp_port = get_env_key('PAIOS_SMTP_PORT', '1025') # Default SMTP port for STARTTLS
+    smtp_port = get_env_key('PAIOS_SMTP_PORT', '1025') # Default SMTP port for Mailhog
     smtp_from = get_env_key('PAIOS_SMTP_FROM', 'paios@localhost')
     smtp_user = get_env_key('PAIOS_SMTP_USER', 'paios@localhost')
     smtp_pass = get_env_key('PAIOS_SMTP_PASS', secrets.token_urlsafe(32))