diff --git a/src/bin/pg_dump/pg_dumpall b/src/bin/pg_dump/pg_dumpall
index 1402b3ffdf3c838d7aab1227b66c3eb1234bc22b..586e75d530ca164ed11361f17996ebb3e48f8c3c 100644
--- a/src/bin/pg_dump/pg_dumpall
+++ b/src/bin/pg_dump/pg_dumpall
@@ -51,16 +51,11 @@ psql -l -A -q -t | grep '|' | tr '|' ' ' | \
 grep -v '^template1 ' | \
 while read DATABASE DBUSERID ENCODING DATAPATH
 do
-	POSTGRES_USER="`echo \" \
-		select usename \
-		from pg_shadow \
-		where usename = $DBUSERID; \" | \
-		psql -A -q -t template1`"
-	echo "${BS}connect template1 $POSTGRES_USER"
+	echo "${BS}connect template1 $DBUSERID"
 
 	if pg_encoding $ENCODING >/dev/null 2>&1
 	then
-		echo "create database $DATABASE with encoding='`pg_encoding $ENCODING`';"
+		echo "create database $DATABASE with encoding='$ENCODING';"
 	else
 		echo "create database $DATABASE;"
 	fi