diff --git a/lib/libc/gen/pw_scan.c b/lib/libc/gen/pw_scan.c
index 9d280f7ded8..00f640bd0e9 100644
--- a/lib/libc/gen/pw_scan.c
+++ b/lib/libc/gen/pw_scan.c
@@ -83,7 +83,7 @@ pw_scan(bp, pw)
 	}
 	if (id > USHRT_MAX) {
 		warnx("%s > max uid value (%d)", p, USHRT_MAX);
-		return (0);
+		/*return (0);*/ /* THIS SHOULD NOT BE FATAL! */
 	}
 	pw->pw_uid = id;
 
@@ -93,7 +93,7 @@ pw_scan(bp, pw)
 	id = atol(p);
 	if (id > USHRT_MAX) {
 		warnx("%s > max gid value (%d)", p, USHRT_MAX);
-		return (0);
+		/* return (0); This should not be fatal! */
 	}
 	pw->pw_gid = id;
 
diff --git a/usr.sbin/pwd_mkdb/pw_scan.c b/usr.sbin/pwd_mkdb/pw_scan.c
index 9d280f7ded8..00f640bd0e9 100644
--- a/usr.sbin/pwd_mkdb/pw_scan.c
+++ b/usr.sbin/pwd_mkdb/pw_scan.c
@@ -83,7 +83,7 @@ pw_scan(bp, pw)
 	}
 	if (id > USHRT_MAX) {
 		warnx("%s > max uid value (%d)", p, USHRT_MAX);
-		return (0);
+		/*return (0);*/ /* THIS SHOULD NOT BE FATAL! */
 	}
 	pw->pw_uid = id;
 
@@ -93,7 +93,7 @@ pw_scan(bp, pw)
 	id = atol(p);
 	if (id > USHRT_MAX) {
 		warnx("%s > max gid value (%d)", p, USHRT_MAX);
-		return (0);
+		/* return (0); This should not be fatal! */
 	}
 	pw->pw_gid = id;