diff --git a/samba/samba-lib.pl b/samba/samba-lib.pl
index b57fbda45..10b7673ff 100755
--- a/samba/samba-lib.pl
+++ b/samba/samba-lib.pl
@@ -597,7 +597,7 @@ while(<PASS>) {
 	chop;
 	s/#.*$//g;
 	local @b = split(/:/, $_);
-	next if (@b < 4);
+	next if (@b < 4 || $b[1] !~ /^\d+$/);
 	local $u = { 'name' => $b[0],  'uid' => $b[1],
 		     'pass1' => $b[2], 'pass2' => $b[3],
 		     'oldname' => $b[0] };