diff --git a/scripts/pop3-brute.nse b/scripts/pop3-brute.nse
index b9354219a..9712d47e5 100644
--- a/scripts/pop3-brute.nse
+++ b/scripts/pop3-brute.nse
@@ -81,12 +81,18 @@ Driver = {
     pstatus, perror = self.login_function(self.socket, username, password, self.additional)
     if pstatus then
       return true, creds.Account:new(username, password, creds.State.VALID)
-    elseif (perror == pop3.err.pwError) then
-      return false, brute.Error:new("Wrong password.")
-    elseif (perror == pop3.err.userError) then
-      return false, brute.Error:new("Wrong username.")
+    else
+      local err
+      if (perror == pop3.err.pwError) then
+        err = brute.Error:new("Wrong password.")
+      elseif (perror == pop3.err.userError) then
+        err = brute.Error:new("Wrong username.")
+        err:setInvalidAccount(username)
+      else
+        err = brute.Error:new("Login failed.")
+      end
+      return false, err
     end
-    return false, brute.Error:new("Login failed.")
   end, --login
 
   disconnect = function(self)