diff --git a/kingbirdclient/api/client.py b/kingbirdclient/api/client.py
index cc0a993..1ff27b5 100644
--- a/kingbirdclient/api/client.py
+++ b/kingbirdclient/api/client.py
@@ -22,7 +22,7 @@ def client(kingbird_url=None, username=None, api_key=None,
            endpoint_type='publicURL', service_type='synchronization',
            auth_token=None, user_id=None, cacert=None, insecure=False,
            profile=None, auth_type='keystone', client_id=None,
-           client_secret=None, **kwargs):
+           client_secret=None, session=None, **kwargs):
     if kingbird_url and not isinstance(kingbird_url, six.string_types):
         raise RuntimeError('Kingbird url should be a string.')
 
@@ -43,6 +43,7 @@ def client(kingbird_url=None, username=None, api_key=None,
         auth_type=auth_type,
         client_id=client_id,
         client_secret=client_secret,
+        session=session,
         **kwargs
     )
 
diff --git a/kingbirdclient/api/v1/client.py b/kingbirdclient/api/v1/client.py
index f0311a9..f1a9474 100644
--- a/kingbirdclient/api/v1/client.py
+++ b/kingbirdclient/api/v1/client.py
@@ -105,10 +105,10 @@ def authenticate(kingbird_url=None, username=None,
         raise RuntimeError(
             'Only user name or user id should be set'
         )
-    user_domain_name = kwargs['user_domain_name']
-    user_domain_id = kwargs['user_domain_id']
-    project_domain_name = kwargs['project_domain_name']
-    project_domain_id = kwargs['project_domain_id']
+    user_domain_name = kwargs.get('user_domain_name')
+    user_domain_id = kwargs.get('user_domain_id')
+    project_domain_name = kwargs.get('project_domain_name')
+    project_domain_id = kwargs.get('project_domain_id')
 
     if session is None:
         if auth_token: