From 6b427faf358c285cc74a7c1248d08ba42b4cbc37 Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@varjolintu.fi>
Date: Fri, 30 May 2025 13:07:29 +0300
Subject: [PATCH] Query form on savedForms check

---
 keepassxc-browser/content/form.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/keepassxc-browser/content/form.js b/keepassxc-browser/content/form.js
index 329d109..a07d2f5 100644
--- a/keepassxc-browser/content/form.js
+++ b/keepassxc-browser/content/form.js
@@ -48,7 +48,12 @@ kpxcForm.formIdentified = function(form) {
 kpxcForm.getCredentialFieldsFromForm = function(form) {
     for (const savedForm of kpxcForm.savedForms) {
         if (savedForm.form === form) {
-            return [ savedForm.username, savedForm.password, savedForm.passwordInputs, savedForm.totp ];
+            // If savedForm has no values, query the form instead
+            return [
+                savedForm.username || form?.querySelector('input[type=text]'),
+                savedForm.password || form?.querySelector('input[type=password]'),
+                savedForm.passwordInputs,
+                savedForm.totp ];
         }
     }