diff --git a/src/complete.rs b/src/complete.rs
index d9708f7d5..2fac1a36d 100644
--- a/src/complete.rs
+++ b/src/complete.rs
@@ -1823,30 +1823,23 @@ fn getpwent_name() -> Option<WString> {
                     break;
                 }
 
-                if string_prefixes_string(user_name, &pw_name) {
+                if let Some(r#match) = StringFuzzyMatch::try_create(user_name, &pw_name, true) {
                     let desc = wgettext_fmt!(COMPLETE_USER_DESC, &pw_name);
                     // Append a user name.
                     // TODO: propagate overflow?
+                    let mut flags = CompleteFlags::NO_SPACE;
+                    if r#match.requires_full_replacement() {
+                        flags |= CompleteFlags::REPLACES_TOKEN | CompleteFlags::DONT_ESCAPE;
+                    }
                     let _ = self.completions.add(Completion::new(
-                        pw_name.slice_from(name_len).to_owned(),
+                        if r#match.requires_full_replacement() {
+                            sprintf!("~%s", &pw_name)
+                        } else {
+                            pw_name.slice_from(name_len).to_owned()
+                        },
                         desc,
-                        StringFuzzyMatch::exact_match(),
-                        CompleteFlags::NO_SPACE,
-                    ));
-                    result = true;
-                } else if string_prefixes_string_case_insensitive(user_name, &pw_name) {
-                    let name = sprintf!("~%s", &pw_name);
-                    let desc = wgettext_fmt!(COMPLETE_USER_DESC, &pw_name);
-
-                    // Append a user name
-                    // TODO: propagate overflow?
-                    let _ = self.completions.add(Completion::new(
-                        name,
-                        desc,
-                        StringFuzzyMatch::exact_match(),
-                        CompleteFlags::REPLACES_TOKEN
-                            | CompleteFlags::DONT_ESCAPE
-                            | CompleteFlags::NO_SPACE,
+                        r#match,
+                        flags,
                     ));
                     result = true;
                 }
diff --git a/tests/checks/complete.fish b/tests/checks/complete.fish
index 62369d9c3..2624c4c27 100644
--- a/tests/checks/complete.fish
+++ b/tests/checks/complete.fish
@@ -727,3 +727,9 @@ complete -c foo -a "foo\\"
 
 complete -C
 # CHECKERR: complete: Can not get commandline in non-interactive mode
+
+if string match -rq -- '^[a-z]+$' $USER
+    set -l first_letter_wrong_case (string sub -l 1 -- $USER | string upper)
+    string match -rq -- "$USER\t.*" (complete -C "echo ~$first_letter_wrong_case")
+    or echo "`complete -C'echo ~$first_letter_wrong_case'` did not yield $USER"
+end