diff --git a/misc/userscripts/password_fill b/misc/userscripts/password_fill
index 5f30a6bf6..8dba68c2b 100755
--- a/misc/userscripts/password_fill
+++ b/misc/userscripts/password_fill
@@ -283,8 +283,8 @@ secret_backend() {
     query_entries() {
         local domain="$1"
         while read -r line ; do
-            if [[ "$line" == "attribute.username ="* ]] ; then
-                files+=("$domain ${line#${BASH_REMATCH[0]}}")
+            if [[ "$line" == "attribute.username = "* ]] ; then
+                files+=("$domain ${line:21}")
             fi
         done < <( secret-tool search --unlock --all domain "$domain" 2>&1 )
     }