diff --git a/pyrogram/client.py b/pyrogram/client.py
index c1d04046..d30a5e9a 100644
--- a/pyrogram/client.py
+++ b/pyrogram/client.py
@@ -270,8 +270,7 @@ class Client(Methods):
 
         self.disconnect_handler = None
 
-        # Username used for mentioned bot commands, e.g.: /start@usernamebot
-        self.username = None
+        self.me: Optional[User] = None
 
         self.message_cache = Cache(10000)
 
diff --git a/pyrogram/filters.py b/pyrogram/filters.py
index 76bff856..f31b385e 100644
--- a/pyrogram/filters.py
+++ b/pyrogram/filters.py
@@ -757,7 +757,7 @@ def command(commands: Union[str, List[str]], prefixes: Union[str, List[str]] = "
     command_re = re.compile(r"([\"'])(.*?)(?<!\\)\1|(\S+)")
 
     async def func(flt, client: pyrogram.Client, message: Message):
-        username = client.username or ""
+        username = client.me.username or ""
         text = message.text or message.caption
         message.command = None
 
diff --git a/pyrogram/methods/auth/initialize.py b/pyrogram/methods/auth/initialize.py
index 48bd6f10..3e692044 100644
--- a/pyrogram/methods/auth/initialize.py
+++ b/pyrogram/methods/auth/initialize.py
@@ -46,5 +46,6 @@ class Initialize:
 
         await self.dispatcher.start()
 
-        self.username = (await self.get_me()).username
+        self.me = await self.get_me()
+
         self.is_initialized = True