diff --git a/xvaga/oswin32.cpp b/xvaga/oswin32.cpp
index 5a0780344..da152e601 100755
--- a/xvaga/oswin32.cpp
+++ b/xvaga/oswin32.cpp
@@ -806,8 +806,7 @@ bool OsWin32_Speak(const char* text, bool async)
 
 int OsWin32_GetSessionId()
 {
-	char str[32];
-	xvt_sys_get_user_name(str, sizeof(str));
+	const wxString str = wxGetUserId();
 
   unsigned short h = 0;
   for (const char* s = str; *s; s++)
diff --git a/xvaga/xvtextra.cpp b/xvaga/xvtextra.cpp
index 524a890bc..b7c584645 100755
--- a/xvaga/xvtextra.cpp
+++ b/xvaga/xvtextra.cpp
@@ -797,7 +797,7 @@ const char* xvt_fsys_get_campo_ini()
         }
       }
     }
-    if (xvt_sys_get_os_version() < XVT_OS_WINDOWS_NT)
+    if (xvt_sys_get_os_version() < XVT_WS_WIN_NT)
     	*username = '\0';
 #endif
 		if (!bFound)