diff --git a/cloud/cloudstack/cs_account.py b/cloud/cloudstack/cs_account.py
index 80ab6748bb0..0313006f894 100644
--- a/cloud/cloudstack/cs_account.py
+++ b/cloud/cloudstack/cs_account.py
@@ -354,7 +354,7 @@ def main():
         first_name = dict(default=None),
         last_name = dict(default=None),
         username = dict(default=None),
-        password = dict(default=None),
+        password = dict(default=None, no_log=True),
         timezone = dict(default=None),
         poll_async = dict(type='bool', default=True),
     ))
diff --git a/cloud/cloudstack/cs_user.py b/cloud/cloudstack/cs_user.py
index a0be4634904..0b2a1fddc63 100644
--- a/cloud/cloudstack/cs_user.py
+++ b/cloud/cloudstack/cs_user.py
@@ -413,7 +413,7 @@ def main():
         email = dict(default=None),
         first_name = dict(default=None),
         last_name = dict(default=None),
-        password = dict(default=None),
+        password = dict(default=None, no_log=True),
         timezone = dict(default=None),
         poll_async = dict(type='bool', default=True),
     ))