diff --git a/modules/auxiliary/scanner/http/chef_webui_login.rb b/modules/auxiliary/scanner/http/chef_webui_login.rb
index fc5e9f04f37b..8added35f199 100644
--- a/modules/auxiliary/scanner/http/chef_webui_login.rb
+++ b/modules/auxiliary/scanner/http/chef_webui_login.rb
@@ -130,11 +130,10 @@ def do_report(ip, port, result)
   end
 
   def init_loginscanner(ip)
-    cred_collection = build_credential_collection(
+    @cred_collection = build_credential_collection(
       username: datastore['USERNAME'],
       password: datastore['PASSWORD']
     )
-    @cred_collection = prepend_db_passwords(cred_collection)
 
     # Always try the default first
     @cred_collection.prepend_cred(
diff --git a/modules/auxiliary/scanner/http/glassfish_login.rb b/modules/auxiliary/scanner/http/glassfish_login.rb
index d8a369bd1662..0606fb1ad1a9 100644
--- a/modules/auxiliary/scanner/http/glassfish_login.rb
+++ b/modules/auxiliary/scanner/http/glassfish_login.rb
@@ -77,11 +77,10 @@ def is_password_required?(version)
 
 
   def init_loginscanner(ip)
-    cred_collection = build_credential_collection(
+    @cred_collection = build_credential_collection(
       username: datastore['USERNAME'],
       password: datastore['PASSWORD']
     )
-    @cred_collection = prepend_db_passwords(cred_collection)
 
     @scanner = Metasploit::Framework::LoginScanner::Glassfish.new(
       configure_http_login_scanner(
diff --git a/modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb b/modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb
index 534b608bd434..0eac188b7984 100644
--- a/modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb
+++ b/modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb
@@ -71,11 +71,10 @@ def anonymous_access?(res)
   end
 
   def init_loginscanner(ip)
-    cred_collection = build_credential_collection(
+    @cred_collection = build_credential_collection(
       username: datastore['HttpUsername'],
       password: datastore['HttpPassword']
     )
-    @cred_collection = prepend_db_passwords(cred_collection)
 
     @scanner = Metasploit::Framework::LoginScanner::Smh.new(
       configure_http_login_scanner(
diff --git a/modules/auxiliary/scanner/http/manageengine_desktop_central_login.rb b/modules/auxiliary/scanner/http/manageengine_desktop_central_login.rb
index 853516a1ef29..3c0f88ad3986 100644
--- a/modules/auxiliary/scanner/http/manageengine_desktop_central_login.rb
+++ b/modules/auxiliary/scanner/http/manageengine_desktop_central_login.rb
@@ -29,11 +29,10 @@ def initialize(info={})
 
   # Initializes CredentialCollection and ManageEngineDesktopCentral
   def init(ip)
-    cred_collection = build_credential_collection(
+    @cred_collection = build_credential_collection(
       username: datastore['USERNAME'],
       password: datastore['PASSWORD']
     )
-    @cred_collection = prepend_db_passwords(cred_collection)
 
     @scanner = Metasploit::Framework::LoginScanner::ManageEngineDesktopCentral.new(
       configure_http_login_scanner(
diff --git a/modules/auxiliary/scanner/http/zabbix_login.rb b/modules/auxiliary/scanner/http/zabbix_login.rb
index 59fac973c9f8..aa9200938f00 100644
--- a/modules/auxiliary/scanner/http/zabbix_login.rb
+++ b/modules/auxiliary/scanner/http/zabbix_login.rb
@@ -131,11 +131,10 @@ def do_report(ip, port, result)
   end
 
   def init_loginscanner(ip)
-    cred_collection = build_credential_collection(
+    @cred_collection = build_credential_collection(
       username: datastore['USERNAME'],
       password: datastore['PASSWORD']
     )
-    @cred_collection = prepend_db_passwords(cred_collection)
 
     # Always try the default first
     @cred_collection.prepend_cred(
diff --git a/modules/auxiliary/scanner/nessus/nessus_rest_login.rb b/modules/auxiliary/scanner/nessus/nessus_rest_login.rb
index cb8066d5b8a3..56c778226229 100644
--- a/modules/auxiliary/scanner/nessus/nessus_rest_login.rb
+++ b/modules/auxiliary/scanner/nessus/nessus_rest_login.rb
@@ -37,11 +37,10 @@ def initialize(info={})
 
   # Initializes CredentialCollection and Nessus Scanner
   def init(ip)
-    cred_collection = build_credential_collection(
+    @cred_collection = build_credential_collection(
       password:        datastore['PASSWORD'],
       username:        datastore['USERNAME']
     )
-    @cred_collection = prepend_db_passwords(cred_collection)
 
     @scanner = Metasploit::Framework::LoginScanner::Nessus.new(
         host: ip,