diff --git a/tableauserverclient/models/personal_access_token_auth.py b/tableauserverclient/models/personal_access_token_auth.py
index a95972164..e1744766d 100644
--- a/tableauserverclient/models/personal_access_token_auth.py
+++ b/tableauserverclient/models/personal_access_token_auth.py
@@ -1,8 +1,8 @@
 class PersonalAccessTokenAuth(object):
-    def __init__(self, token_name, personal_access_token, site_id=""):
+    def __init__(self, token_name, personal_access_token, site_id=None):
         self.token_name = token_name
         self.personal_access_token = personal_access_token
-        self.site_id = site_id
+        self.site_id = site_id if site_id is not None else ""
         # Personal Access Tokens doesn't support impersonation.
         self.user_id_to_impersonate = None
 
diff --git a/tableauserverclient/models/tableau_auth.py b/tableauserverclient/models/tableau_auth.py
index 01787de4e..3033e9ee9 100644
--- a/tableauserverclient/models/tableau_auth.py
+++ b/tableauserverclient/models/tableau_auth.py
@@ -1,17 +1,17 @@
 class TableauAuth(object):
-    def __init__(self, username, password, site=None, site_id="", user_id_to_impersonate=None):
+    def __init__(self, username, password, site=None, site_id=None, user_id_to_impersonate=None):
         if site is not None:
             import warnings
 
             warnings.warn(
-                'TableauAuth(...site=""...) is deprecated, ' 'please use TableauAuth(...site_id=""...) instead.',
+                "TableauAuth(..., site=...) is deprecated, " "please use TableauAuth(..., site_id=...) instead.",
                 DeprecationWarning,
             )
             site_id = site
 
         self.user_id_to_impersonate = user_id_to_impersonate
         self.password = password
-        self.site_id = site_id
+        self.site_id = site_id if site_id is not None else ""
         self.username = username
 
     @property