diff --git a/share/functions/__fish_print_users.fish b/share/functions/__fish_print_users.fish
index e1c93ffa4..f6d41fa93 100644
--- a/share/functions/__fish_print_users.fish
+++ b/share/functions/__fish_print_users.fish
@@ -3,7 +3,7 @@ function __fish_print_users --description "Print a list of local users"
 	if test -x /usr/bin/getent
 		getent passwd | cut -d : -f 1
 	else if test -x /usr/bin/dscl # OS X support
-		dscl . -list /Users
+		dscl . -list /Users | __fish_sgrep -v '^_'
 	else
 		__fish_sgrep -ve '^#' /etc/passwd | cut -d : -f 1
 	end