diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 2ea48f4654..26b8c2354a 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.32 1997/05/07 03:13:50 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.33 1997/05/09 03:28:49 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -73,13 +73,13 @@ static PQconninfoOption PQconninfoOptions[] = {
 /*    Option-name	Environment-Var	Compiled-in	Current value	*/
 /*			Label				Disp-Char	*/
 /*    ----------------- --------------- --------------- --------------- */
-    { "authtype",       "PGAUTHTYPE",   NULL,           NULL,
+    { "authtype",       "PGAUTHTYPE",  DefaultAuthtype, NULL,
                         "Database-Authtype",            "", 20  },
 
     { "user",		"PGUSER",	NULL,		NULL,
     			"Database-User",		"", 20	},
 
-    { "password",       "PGPASSWORD",   NULL,           NULL,
+    { "password",       "PGPASSWORD",  DefaultPassword, NULL,
                         "Database-Password",            "", 20  },
 
     { "dbname",		"PGDATABASE",	NULL,		NULL,
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index c765661e71..c5eefc182a 100644
--- a/src/interfaces/libpq/libpq-fe.h
+++ b/src/interfaces/libpq/libpq-fe.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: libpq-fe.h,v 1.18 1997/03/12 21:23:16 scrappy Exp $
+ * $Id: libpq-fe.h,v 1.19 1997/05/09 03:28:54 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -301,6 +301,9 @@ int lo_export(PGconn *conn, Oid lobjId, char *filename);
 #define DefaultHost	"localhost"
 #define DefaultTty	""
 #define DefaultOption	""
+#define DefaultAuthtype       ""
+#define DefaultPassword       ""
+
 
 typedef void *TUPLE;
 #define palloc malloc