diff --git a/src/client/login.c b/src/client/login.c
index 869eb1de..f67f0a8c 100644
--- a/src/client/login.c
+++ b/src/client/login.c
@@ -71,6 +71,7 @@ login(int s, char *uname, char *cname, char *cpass, int kill_proc, int utf8)
     }
     if (cname == NULL) {
 	(void)printf("Country name? ");
+	fflush(stdout);
 	cname = fgets(tmp, sizeof(tmp), stdin);
 	if (cname == NULL || *cname == 0)
 	    return 0;
@@ -91,6 +92,7 @@ login(int s, char *uname, char *cname, char *cpass, int kill_proc, int utf8)
 #else
 	printf("Note: This is echoed to the screen\n");
 	printf("Your name? ");
+	fflush(stdout);
 	cpass = fgets(tmp, sizeof(tmp), stdin);
 	if (cpass == NULL || *cpass == 0)
 	    return 0;
@@ -129,5 +131,6 @@ login(int s, char *uname, char *cname, char *cpass, int kill_proc, int utf8)
 	printf("   this version: %d, current version: %d\n",
 	       CLIENTPROTO, atoi(ptr));
     }
+    fflush(stdout);
     return 1;
 }
diff --git a/src/client/main.c b/src/client/main.c
index f56bd44f..7c841823 100644
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -109,6 +109,7 @@ main(int ac, char **av)
     int utf8 = 0;
 
 #ifdef _WIN32
+    setvbuf(stdout, NULL, _IOLBF, 4096);
     err = WSAStartup(0x0101, &WsaData);
     if (err == SOCKET_ERROR) {
 	printf("WSAStartup Failed\n");