diff --git a/src/bin/pg_dump/pg_dumpall b/src/bin/pg_dump/pg_dumpall
index c4424c9232..1402b3ffdf 100644
--- a/src/bin/pg_dump/pg_dumpall
+++ b/src/bin/pg_dump/pg_dumpall
@@ -54,11 +54,11 @@ do
 	POSTGRES_USER="`echo \" \
 		select usename \
 		from pg_shadow \
-		where usesysid = $DBUSERID; \" | \
+		where usename = $DBUSERID; \" | \
 		psql -A -q -t template1`"
 	echo "${BS}connect template1 $POSTGRES_USER"
 
-	if createdb -help|grep encoding >/dev/null
+	if pg_encoding $ENCODING >/dev/null 2>&1
 	then
 		echo "create database $DATABASE with encoding='`pg_encoding $ENCODING`';"
 	else