diff --git a/opennebula_api/models.py b/opennebula_api/models.py
index f8ef6481..31b8955d 100644
--- a/opennebula_api/models.py
+++ b/opennebula_api/models.py
@@ -485,11 +485,17 @@ class OpenNebulaManager():
         )
 
     def change_user_password(self, passwd_hash):
-        self.oneadmin_client.call(
-            oca.User.METHODS['passwd'],
-            self.opennebula_user.id,
-            passwd_hash
-        )
+        if type(self.opennebula_user) == int:
+            logger.debug("opennebula_user is int and has value = %s" %
+                         self.opennebula_user)
+        else:
+            logger.debug("opennebula_user is object and corresponding id is %s"
+                         % self.opennebula_user.id)
+        # self.oneadmin_client.call(
+        #     oca.User.METHODS['passwd'],
+        #     self.opennebula_user if type(self.opennebula_user) == int else self.opennebula_user.id,
+        #     passwd_hash
+        # )
 
     def add_public_key(self, user, public_key='', merge=False):
         """