diff --git a/modules/auxiliary/admin/smb/ms17_010_command.rb b/modules/auxiliary/admin/smb/ms17_010_command.rb
index 1297723c4a..e866c39653 100644
--- a/modules/auxiliary/admin/smb/ms17_010_command.rb
+++ b/modules/auxiliary/admin/smb/ms17_010_command.rb
@@ -71,6 +71,9 @@ class MetasploitModule < Msf::Auxiliary
   def run_host(ip)
 
     begin
+      if datastore['SMBUser'].present?
+        print_status("Authenticating to #{ip} as user '#{splitname(datastore['SMBUser'])}'...")
+      end
       eternal_pwn(ip)         # exploit Admin session
       smb_pwn(ip)             # psexec
 
diff --git a/modules/exploits/windows/smb/ms17_010_psexec.rb b/modules/exploits/windows/smb/ms17_010_psexec.rb
index 535f0fd107..e0eb44b5ba 100644
--- a/modules/exploits/windows/smb/ms17_010_psexec.rb
+++ b/modules/exploits/windows/smb/ms17_010_psexec.rb
@@ -102,6 +102,9 @@ class MetasploitModule < Msf::Exploit::Remote
 
   def exploit
     begin
+      if datastore['SMBUser'].present?
+        print_status("Authenticating to #{datastore['RHOSTS']} as user '#{splitname(datastore['SMBUser'])}'...")
+      end
       eternal_pwn(datastore['RHOST'])
       smb_pwn()