diff --git a/CHANGELOG b/CHANGELOG
index a8e95a097..1cdb2e3a8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [NSE] Re-enabled support for guessing the username in addition to password
+  that was incorrectly removed from the metasploit-xmlrpc-brute in previous
+  commit. [Patrik]
+  
 o [NSE] Added the script metasploit-xmlrpc-brute that performs password
   auditing against the Metasploit XMLRPC service. [Vlatko Kosturjak]
 
diff --git a/scripts/metasploit-xmlrpc-brute.nse b/scripts/metasploit-xmlrpc-brute.nse
index 9f456be93..a042d3163 100644
--- a/scripts/metasploit-xmlrpc-brute.nse
+++ b/scripts/metasploit-xmlrpc-brute.nse
@@ -46,7 +46,7 @@ Driver =
 	end,
 
 	login = function( self, username, password )
-		local xmlreq='<?xml version="1.0" ?><methodCall><methodName>auth.login</methodName><params><param><value><string>msf</string></value></param><param><value><string>'..password.."</string></value></param></params></methodCall>\n"..string.char(0)
+		local xmlreq='<?xml version="1.0" ?><methodCall><methodName>auth.login</methodName><params><param><value><string>'..username..'</string></value></param><param><value><string>'..password.."</string></value></param></params></methodCall>\n"..string.char(0)
 		local status, err = self.socket:send(xmlreq)
 
 		if ( not ( status ) ) then
@@ -88,7 +88,6 @@ action = function(host, port)
 	local engine = brute.Engine:new(Driver, host, port, opts)
 	engine.options.script_name = SCRIPT_NAME
 	engine.options.firstonly = true
-	engine.options.passonly = true
 	status, result = engine:start()
 	return result
 end