diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c
new file mode 100644
index 1a5284e..5406a98
*** a/src/bin/scripts/common.c
--- b/src/bin/scripts/common.c
*************** connectMaintenanceDatabase(const char *m
*** 197,213 ****
  						   progname, true);
  	if (!conn)
  		conn = connectDatabase("template1", pghost, pgport, pguser,
! 							   prompt_password, progname, true);
! 
! 	if (!conn)
! 	{
! 		fprintf(stderr, _("%s: could not connect to databases \"postgres\" or \"template1\"\n"
! 						  "Please specify an alternative maintenance database.\n"),
! 				progname);
! 		fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
! 				progname);
! 		exit(1);
! 	}
  
  	return conn;
  }
--- 197,203 ----
  						   progname, true);
  	if (!conn)
  		conn = connectDatabase("template1", pghost, pgport, pguser,
! 							   prompt_password, progname, false);
  
  	return conn;
  }