diff --git a/BotBase/modules/livechat.py b/BotBase/modules/livechat.py
index 2ec04d0..7fe3218 100644
--- a/BotBase/modules/livechat.py
+++ b/BotBase/modules/livechat.py
@@ -40,7 +40,7 @@ def begin_chat(client, query):
         join_chat_button = InlineKeyboardMarkup([[InlineKeyboardButton(JOIN_CHAT_BUTTON, f"join_{query.from_user.id}")]])
         user = get_user(query.from_user.id)
         _, uid, uname, date, banned = user
-        text = USER_INFO.format(uid=uid, uname='@' + uname if uname != 'null' else uname, date=date,
+        text = USER_INFO.format(uid=uid, uname='@' + uname if uname else 'null', date=date,
                                 status=YES if banned else NO,
                                 admin='N/A')
         CACHE[query.from_user.id].append([])
@@ -72,7 +72,7 @@ def update_admins_list(_, query):
             join_chat_button = InlineKeyboardMarkup([[InlineKeyboardButton(JOIN_CHAT_BUTTON, f"join_{query.from_user.id}")]])
             user = get_user(query.from_user.id)
             _, uid, uname, date, banned = user
-            text = USER_INFO.format(uid=uid, uname='@' + uname if uname != 'null' else uname, date=date,
+            text = USER_INFO.format(uid=uid, uname='@' + uname if uname else 'null', date=date,
                                     status=YES if banned else NO,
                                     admin='N/A')
             for admin in ADMINS: