diff --git a/share/functions/__fish_complete_pg_database.fish b/share/functions/__fish_complete_pg_database.fish
index ef5030211..6a17389ea 100644
--- a/share/functions/__fish_complete_pg_database.fish
+++ b/share/functions/__fish_complete_pg_database.fish
@@ -1,3 +1,3 @@
 function __fish_complete_pg_database
-    psql -AtqwlF \t 2>/dev/null | awk 'NF > 1 { print $1 }'
+    psql -AtqwlXF \t 2>/dev/null | awk 'NF > 1 { print $1 }'
 end
diff --git a/share/functions/__fish_complete_pg_user.fish b/share/functions/__fish_complete_pg_user.fish
index 4da50d538..4770e5c9c 100644
--- a/share/functions/__fish_complete_pg_user.fish
+++ b/share/functions/__fish_complete_pg_user.fish
@@ -1,3 +1,3 @@
 function __fish_complete_pg_user
-    psql -Atqwc 'select usename from pg_user' template1 2>/dev/null
+    psql -AtqwXc 'select usename from pg_user' template1 2>/dev/null
 end