diff --git a/cpapi/mgmt_api.py b/cpapi/mgmt_api.py
index 83d2396..dc42370 100644
--- a/cpapi/mgmt_api.py
+++ b/cpapi/mgmt_api.py
@@ -368,7 +368,10 @@ def api_call(self, command, payload=None, sid=None, wait_for_task=True, timeout=
         # would not appear as plaintext in the debug file.
         if command == "login":
             json_data = compatible_loads(_data)
-            json_data["password"] = "****"
+            if "password" in json_data:
+                json_data["password"] = "****"
+            if "api-key" in json_data:
+                json_data["api-key"] = "****"
             _data = json.dumps(json_data)
 
         if self.debug_file:
diff --git a/setup.py b/setup.py
index 9b5a5b1..b35bd99 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name="cp-mgmt-api-sdk",
-    version="1.8.0",
+    version="1.9.0",
     author="API team",
     author_email="api_team@checkpoint.com",
     license='Apache 2.0',