diff --git a/lib/ansible/modules/cloud/linode/linode.py b/lib/ansible/modules/cloud/linode/linode.py
index 022dc231bf..079feea39f 100644
--- a/lib/ansible/modules/cloud/linode/linode.py
+++ b/lib/ansible/modules/cloud/linode/linode.py
@@ -443,14 +443,14 @@ def main():
             state = dict(default='present', choices=['active', 'present', 'started',
                                                      'deleted', 'absent', 'stopped',
                                                      'restarted']),
-            api_key = dict(),
+            api_key = dict(no_log=True),
             name = dict(type='str'),
             plan = dict(type='int'),
             distribution = dict(type='int'),
             datacenter = dict(type='int'),
             linode_id = dict(type='int', aliases=['lid']),
             payment_term = dict(type='int', default=1, choices=[1, 12, 24]),
-            password = dict(type='str'),
+            password = dict(type='str', no_log=True),
             ssh_pub_key = dict(type='str'),
             swap = dict(type='int', default=512),
             wait = dict(type='bool', default=True),