diff --git a/pyrogram/client/client.py b/pyrogram/client/client.py
index ca737f2f..e67876d9 100644
--- a/pyrogram/client/client.py
+++ b/pyrogram/client/client.py
@@ -135,7 +135,7 @@ class Client:
 
     def __init__(self,
                  session_name: str,
-                 api_id: int = None,
+                 api_id: int or str = None,
                  api_hash: str = None,
                  proxy: dict or Proxy = None,
                  test_mode: bool = False,
@@ -147,7 +147,7 @@ class Client:
                  last_name: str = None,
                  workers: int = 4):
         self.session_name = session_name
-        self.api_id = api_id
+        self.api_id = int(api_id)
         self.api_hash = api_hash
         self.proxy = proxy
         self.test_mode = test_mode
@@ -381,7 +381,7 @@ class Client:
             self.phone_code = (
                 input("Enter phone code: ") if self.phone_code is None
                 else self.phone_code if type(self.phone_code) is str
-                else self.phone_code()
+                else str(self.phone_code())
             )
 
             try: