diff --git a/src/options.c b/src/options.c
index f3e7c3fdd..351c3903d 100644
--- a/src/options.c
+++ b/src/options.c
@@ -2559,6 +2559,14 @@ optfn_name(
 
         if ((op = string_for_env_opt(allopt[optidx].name, opts, FALSE))
             != empty_optstr) {
+#ifdef WIN32
+            /*
+             * Under windows, if we already set flags.debug with -D
+             * on the command line, leave that alone.
+             */
+            if (flags.debug && !strcmpi(svp.plname, "wizard"))
+                return optn_ok;
+#endif
             nmcpy(svp.plname, op, PL_NSIZ);
         } else
             return optn_err;
diff --git a/sys/windows/windmain.c b/sys/windows/windmain.c
index bc8d3b661..fb21f8271 100644
--- a/sys/windows/windmain.c
+++ b/sys/windows/windmain.c
@@ -399,8 +399,6 @@ _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);*/
        setting of renameallowed; when False, player_selection()
        won't resent renaming as an option */
     iflags.renameallowed = FALSE;
-    /* Obtain the name of the logged on user and incorporate
-     * it into the name. */
     Sprintf(fnamebuf, "%s", svp.plname);
     (void) fname_encode(
         "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_-.", '%',