diff --git a/callback_plugins/logdetail.py b/callback_plugins/logdetail.py
index 87b4226523..71640f055e 100644
--- a/callback_plugins/logdetail.py
+++ b/callback_plugins/logdetail.py
@@ -107,7 +107,8 @@ class LogMech(object):
                 name = invoc['module_name']
                 
             del(data['invocation'])
-            data.update(invoc)
+            #don't add this since it can often contain complete passwords :(
+            #data.update(invoc)
 
         if task:
             name = task.name
diff --git a/tasks/base.yml b/tasks/base.yml
index 49cb62cfe3..ae932524fd 100644
--- a/tasks/base.yml
+++ b/tasks/base.yml
@@ -16,7 +16,7 @@
   - sshd
 
 - name: set root passwd
-  action: user name=root password=$rootpw state=present
+  action: user name=root password={{ rootpw }} state=present
   tags:
   - rootpw