diff --git a/CHANGELOG b/CHANGELOG
index b7eff8b9b..9c788a837 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [NSE][GH#577] Script http-default-accounts now can test systems that return
+  status 200 for non-existent pages. [nnposter]
+
 o [NSE][GH#573] Updated http.lua to allow processing of HTTP responses with
   malformed header names. Such header lines are still captured in the rawheader
   list but skipped otherwise. [nnposter]
diff --git a/nselib/data/http-default-accounts-fingerprints.lua b/nselib/data/http-default-accounts-fingerprints.lua
index d009f005b..5d6538d75 100644
--- a/nselib/data/http-default-accounts-fingerprints.lua
+++ b/nselib/data/http-default-accounts-fingerprints.lua
@@ -18,9 +18,6 @@ local have_openssl, openssl = pcall(require, 'openssl')
 -- * <code>paths</code> - Paths table containing the possible location of the target
 -- * <code>target_check</code> - Validation function of the target (optional)
 -- * <code>login_check</code> - Login function of the target
---
--- TODO: Update the functionality of <code>target_check</code> to differentiate
---       between valid HTTP/200 and a custom error page.
 ---
 
 -- Recursively copy a table.
@@ -319,9 +316,6 @@ table.insert(fingerprints, {
   paths = {
     {path = "/logo_t.gif"}
   },
-  target_check = function (host, port, path, response)
-    return response.status == 200
-  end,
   login_combos = {
     {username = "", password = ""}
   },
diff --git a/scripts/http-default-accounts.nse b/scripts/http-default-accounts.nse
index aa0374448..124f04694 100644
--- a/scripts/http-default-accounts.nse
+++ b/scripts/http-default-accounts.nse
@@ -231,12 +231,16 @@ action = function(host, port)
   local basepath = stdnse.get_script_args("http-default-accounts.basepath") or "/"
   local output_lns = {}
 
-  -- Identify servers that answer 200 to invalid HTTP requests and exit as these would invalidate the tests
+  -- Determine the target's response to "404" HTTP requests.
   local status_404, result_404, known_404 = http.identify_404(host,port)
-  if ( status_404 and result_404 == 200 ) then
-    stdnse.debug1("Exiting due to ambiguous response from web server on %s:%s. All URIs return status 200.", host.ip, port.number)
-    return nil
-  end
+  -- The default target_check is the existence of the probe path on the target.
+  -- To reduce false-positives, fingerprints that lack target_check() will not
+  -- be tested on targets on which a "404" response is 200.
+  local default_target_check =
+    function (host, port, path, response)
+      if status_404 and result_404 == 200 then return false end
+      return http.page_exists(response, result_404, known_404, path, true)
+    end
 
   --Load fingerprint data or abort
   status, fingerprints = load_fingerprints(fingerprint_filename, category)
@@ -276,6 +280,7 @@ action = function(host, port)
 
   -- Iterate through responses to find a candidate for login routine
   for _, fingerprint in ipairs(fingerprints) do
+    local target_check = fingerprint.target_check or default_target_check
     local credentials_found = false
     stdnse.debug(1, "Processing %s", fingerprint.name)
     for _, probe in ipairs(fingerprint.paths) do
@@ -283,10 +288,7 @@ action = function(host, port)
       if result and not credentials_found then
         local path = basepath .. probe['path']
 
-        if http.page_exists(result, result_404, known_404, path, true)
-          and (not fingerprint.target_check
-          or fingerprint.target_check(host, port, path, result))
-        then
+        if target_check(host, port, path, result) then
           for _, login_combo in ipairs(fingerprint.login_combos) do
             stdnse.debug(2, "Trying login combo -> %s:%s", login_combo["username"], login_combo["password"])
             --Check default credentials