diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index c0a7a55..2e32673 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3226,7 +3226,8 @@ connection_warnings(bool in_startup)
 										 sverbuf, sizeof(sverbuf)));
 
 #ifdef WIN32
-		checkWin32Codepage();
+		if (in_startup)
+			checkWin32Codepage();
 #endif
 		printSSLInfo();
 		printGSSInfo();
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 44a7824..0e9e59c 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -408,7 +408,12 @@ CheckConnection(void)
 			UnsyncVariables();
 		}
 		else
+		{
 			fprintf(stderr, _("Succeeded.\n"));
+			/* re-sync, just in case anything changed */
+			SyncVariables();
+			connection_warnings(false); /* Must be after SyncVariables */
+		}
 	}
 
 	return OK;