From 45a00b851d282894295c5d86f8b3900dc7d26ea0 Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@protonmail.com>
Date: Wed, 5 Sep 2018 10:54:12 +0300
Subject: [PATCH] Fix entering username manually

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

diff --git a/keepassxc-browser/keepassxc-browser.js b/keepassxc-browser/keepassxc-browser.js
index 107f91c..91d2ffb 100755
--- a/keepassxc-browser/keepassxc-browser.js
+++ b/keepassxc-browser/keepassxc-browser.js
@@ -158,7 +158,12 @@ cipAutocomplete.onBlur = function() {
     else {
         const fieldId = cipFields.prepareId(jQuery(this).attr('data-cip-id'));
         const fields = cipFields.getCombination('username', fieldId);
-        if (_f(fields.password) && _f(fields.password).data('unchanged') !== true && jQuery(this).val() !== '' && _detectedFields > 1) {
+        const fieldValue = jQuery(this).val();
+
+        // Check if the manually inserted value is one of the retrieved credentials
+        let fieldFound = cipAutocomplete.elements.some(e => e.value === fieldValue);
+
+        if (_f(fields.password) && _f(fields.password).data('unchanged') !== true && fieldFound && _detectedFields > 1) {
             cip.fillInCredentials(fields, true, true);
         }
     }