diff --git a/src/shared/userdb.c b/src/shared/userdb.c
index be7c77d9503..a1da514884d 100644
--- a/src/shared/userdb.c
+++ b/src/shared/userdb.c
@@ -853,6 +853,7 @@ int userdb_iterator_get(UserDBIterator *iterator, UserRecord **ret) {
                 /* If NSS isn't covered elsewhere, let's iterate through it first, since it probably contains
                  * the more traditional sources, which are probably good to show first. */
 
+                errno = 0;
                 pw = getpwent();
                 if (pw) {
                         _cleanup_free_ char *buffer = NULL;
diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c
index e47c3761d0b..8a85778ef7d 100644
--- a/src/userdb/userdbctl.c
+++ b/src/userdb/userdbctl.c
@@ -1227,7 +1227,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "chain",        no_argument,       NULL, ARG_CHAIN        },
                 { "uid-min",      required_argument, NULL, ARG_UID_MIN      },
                 { "uid-max",      required_argument, NULL, ARG_UID_MAX      },
-                { "fuzzy",        required_argument, NULL, 'z'              },
+                { "fuzzy",        no_argument,       NULL, 'z'              },
                 { "disposition",  required_argument, NULL, ARG_DISPOSITION  },
                 { "boundaries",   required_argument, NULL, ARG_BOUNDARIES   },
                 {}