diff --git a/keepassxc-browser/content/autocomplete.js b/keepassxc-browser/content/autocomplete.js
index 559b5b9..0483cf2 100644
--- a/keepassxc-browser/content/autocomplete.js
+++ b/keepassxc-browser/content/autocomplete.js
@@ -33,6 +33,7 @@ kpxcAutocomplete.create = function(input, showListInstantly = false, autoSubmit
 
 kpxcAutocomplete.showList = function(inputField) {
     kpxcAutocomplete.closeList();
+    kpxcAutocomplete.input = inputField;
     const div = kpxcUI.createElement('div', 'kpxcAutocomplete-items', { 'id': 'kpxcAutocomplete-list' });
 
     // Element position
@@ -191,7 +192,7 @@ kpxcAutocomplete.fillPassword = function(value, index) {
     const combination = kpxcFields.getCombination(givenType, fieldId);
     combination.loginId = index;
 
-    kpxc.fillInCredentials(combination, false, false);
+    kpxc.fillInCredentials(combination, givenType === 'password', false);
     kpxcAutocomplete.input.setAttribute('fetched', true);
 };
 
diff --git a/keepassxc-browser/content/keepassxc-browser.js b/keepassxc-browser/content/keepassxc-browser.js
index 572d727..dc51f53 100755
--- a/keepassxc-browser/content/keepassxc-browser.js
+++ b/keepassxc-browser/content/keepassxc-browser.js
@@ -1240,7 +1240,7 @@ kpxc.fillIn = function(combination, onlyPassword, suppressWarnings) {
     } else if (combination.loginId !== undefined && kpxc.credentials[combination.loginId]) {
         // Specific login ID given
         let filledIn = false;
-        if (uField) {
+        if (uField && (!onlyPassword || _singleInputEnabledForPage)) {
             kpxc.setValueWithChange(uField, kpxc.credentials[combination.loginId].login);
             browser.runtime.sendMessage({
                 action: 'page_set_login_id', args: [ combination.loginId ]