diff --git a/pyrogram/client/client.py b/pyrogram/client/client.py
index dde583dc..e2fe648e 100644
--- a/pyrogram/client/client.py
+++ b/pyrogram/client/client.py
@@ -129,6 +129,11 @@ class Client(Methods, BaseClient):
                  session_name: str,
                  api_id: int or str = None,
                  api_hash: str = None,
+                 app_version: str = None,
+                 device_model: str = None,
+                 system_version: str = None,
+                 system_lang_code: str = None,
+                 lang_code: str = None,
                  proxy: dict = None,
                  test_mode: bool = False,
                  phone_number: str = None,
@@ -145,6 +150,11 @@ class Client(Methods, BaseClient):
         self.session_name = session_name
         self.api_id = int(api_id) if api_id else None
         self.api_hash = api_hash
+        self.app_version = app_version
+        self.device_model = device_model
+        self.system_version = system_version
+        self.system_lang_code = system_lang_code
+        self.lang_code = lang_code
         # TODO: Make code consistent, use underscore for private/protected fields
         self._proxy = proxy
         self.test_mode = test_mode
@@ -854,6 +864,68 @@ class Client(Methods, BaseClient):
                     "More info: https://docs.pyrogram.ml/start/ProjectSetup#configuration"
                 )
 
+        # TODO: Woah! Some redundant code down here
+
+        if self.app_version:
+            pass
+        else:
+            self.app_version = Client.APP_VERSION
+
+            if parser.has_section("pyrogram"):
+                self.app_version = parser.get(
+                    "pyrogram",
+                    "app_version",
+                    fallback=Client.APP_VERSION
+                )
+
+        if self.device_model:
+            pass
+        else:
+            self.device_model = Client.DEVICE_MODEL
+
+            if parser.has_section("pyrogram"):
+                self.device_model = parser.get(
+                    "pyrogram",
+                    "device_model",
+                    fallback=Client.DEVICE_MODEL
+                )
+
+        if self.system_version:
+            pass
+        else:
+            self.system_version = Client.SYSTEM_VERSION
+
+            if parser.has_section("pyrogram"):
+                self.system_version = parser.get(
+                    "pyrogram",
+                    "system_version",
+                    fallback=Client.SYSTEM_VERSION
+                )
+
+        if self.system_lang_code:
+            pass
+        else:
+            self.system_lang_code = Client.SYSTEM_LANG_CODE
+
+            if parser.has_section("pyrogram"):
+                self.system_lang_code = parser.get(
+                    "pyrogram",
+                    "system_lang_code",
+                    fallback=Client.SYSTEM_LANG_CODE
+                )
+
+        if self.lang_code:
+            pass
+        else:
+            self.lang_code = Client.LANG_CODE
+
+            if parser.has_section("pyrogram"):
+                self.lang_code = parser.get(
+                    "pyrogram",
+                    "lang_code",
+                    fallback=Client.LANG_CODE
+                )
+
         if self._proxy:
             self._proxy["enabled"] = True
         else:
diff --git a/pyrogram/session/session.py b/pyrogram/session/session.py
index b643650b..77188156 100644
--- a/pyrogram/session/session.py
+++ b/pyrogram/session/session.py
@@ -142,11 +142,11 @@ class Session:
                             layer,
                             functions.InitConnection(
                                 api_id=self.client.api_id,
-                                device_model=self.client.DEVICE_MODEL,
-                                system_version=self.client.SYSTEM_VERSION,
-                                app_version=self.client.APP_VERSION,
-                                system_lang_code=self.client.SYSTEM_LANG_CODE,
-                                lang_code=self.client.LANG_CODE,
+                                app_version=self.client.app_version,
+                                device_model=self.client.device_model,
+                                system_version=self.client.system_version,
+                                system_lang_code=self.client.system_lang_code,
+                                lang_code=self.client.lang_code,
                                 lang_pack="",
                                 query=functions.help.GetConfig(),
                             )