diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 78e124c52..0e3472957 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -25,7 +25,8 @@ If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
  - OS: [e.g. Windows 10]
- - Version [e.g. v2.06]
+ - Version [e.g. v2.06 build 2007]
+ - Build type [i.e. regular, optimized, or dev]
 
 **Additional context**
-Add any other context about the problem here.
+Add any other context about the problem here. If you are using an Optimized build, make sure to try the regular build too before filing a bug report!
diff --git a/src/win/win.c b/src/win/win.c
index e8d2af475..9bdb91a56 100644
--- a/src/win/win.c
+++ b/src/win/win.c
@@ -362,10 +362,6 @@ WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpszArg, int nCmdShow)
     /* Set the application version ID string. */
     sprintf(emu_version, "%s v%s", EMU_NAME, EMU_VERSION);
 
-    /* Enable crash dump services. */
-    if (enable_crashdump)
-	InitCrashDump();
-
     /* First, set our (default) language. */
     set_language(0x0409);
 
@@ -389,6 +385,10 @@ WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpszArg, int nCmdShow)
 	free(argw);
 	return(1);
     }
+	
+    /* Enable crash dump services. */
+    if (enable_crashdump)
+	InitCrashDump();
 
     if (force_debug)
 	atexit(CloseConsole);