diff --git a/modules/exploits/multi/http/tomcat_mgr_deploy.rb b/modules/exploits/multi/http/tomcat_mgr_deploy.rb
index 74d693ed0b..6ebe62c6ba 100644
--- a/modules/exploits/multi/http/tomcat_mgr_deploy.rb
+++ b/modules/exploits/multi/http/tomcat_mgr_deploy.rb
@@ -117,6 +117,9 @@ class Metasploit3 < Msf::Exploit::Remote
 	end
 
 	def check
+		datastore['BasicAuthUser'] = datastore['USERNAME']
+		datastore['BasicAuthPass'] = datastore['PASSWORD']
+
 		res = query_serverinfo
 		disconnect
 		return CheckCode::Unknown if res.nil?