diff --git a/sabnzbd/nzbstuff.py b/sabnzbd/nzbstuff.py
index edb0b63..e33d8ba 100644
--- a/sabnzbd/nzbstuff.py
+++ b/sabnzbd/nzbstuff.py
@@ -1058,7 +1058,8 @@ class NzbObject(TryList):
                 name = platform_encode(name)
                 self.password = platform_encode(password)
             else:
-                name, self.password = scan_password(platform_encode(name))
+                name, password = scan_password(platform_encode(name))
+                self.password = self.password or password
             self.final_name = sanitize_foldername(name)
             self.save_to_disk()