diff --git a/lib/pan/xapi.py b/lib/pan/xapi.py
index 9e454c2..f5b381a 100644
--- a/lib/pan/xapi.py
+++ b/lib/pan/xapi.py
@@ -603,7 +603,10 @@ def keygen(self, extra_qs=None):
         if extra_qs is not None:
             query = self.__merge_extra_qs(query, extra_qs)
 
-        response = self.__api_request(query)
+        try:
+            response = self.__api_request(query)
+        finally:
+            query.pop('password', None)
         if not response:
             raise PanXapiError(self.status_detail)