diff --git a/Changes b/Changes
index a8885e095..a880334fb 100644
--- a/Changes
+++ b/Changes
@@ -1399,3 +1399,5 @@
   included that shouldn't. Reported by avb (#0003102), patch supplied by Bock.
 - Made it so that when 'java' is enabled for a listen block, then the 2nd parameter to
   NICK is not seen as a password on this port. Patch from afolentes (#0003097).
+- Fixed some unitialized pointer things for win32 w/ssl on keyprompt, no idea if it
+  helps, though. Would appreciate it if another code looks into this. -- Syzop
diff --git a/src/ssl.c b/src/ssl.c
index 1a4b3d880..9d399d61b 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -54,9 +54,9 @@ typedef struct {
 
 #define CHK_SSL(err) if ((err)==-1) { ERR_print_errors_fp(stderr); }
 #ifdef _WIN32
-static StreamIO *streamp;
+static StreamIO *streamp = NULL;
 LRESULT SSLPassDLG(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam) {
-	StreamIO *stream;
+	StreamIO *stream = NULL;
 	switch (Message) {
 		case WM_INITDIALOG:
 			return TRUE;