diff --git a/nova/rpc/common.py b/nova/rpc/common.py
index 201bc8acbdc8..25f287251e88 100644
--- a/nova/rpc/common.py
+++ b/nova/rpc/common.py
@@ -108,7 +108,10 @@ class Connection(object):
 
 def _safe_log(log_func, msg, msg_data):
     """Sanitizes the msg_data field before logging."""
-    SANITIZE = {'set_admin_password': ('new_pass',)}
+    SANITIZE = {
+                'set_admin_password': ('new_pass',),
+                'run_instance': ('admin_password',),
+               }
     method = msg_data['method']
     if method in SANITIZE:
         msg_data = copy.deepcopy(msg_data)