diff --git a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
index 31f6f63dab5..f4e13e7b68b 100644
--- a/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
+++ b/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp
@@ -71,9 +71,16 @@ MSVCBackend::_generate_vcproj ( const Module& module )
 	size_t i;
 
 	string vcproj_file = VcprojFileName(module);
+	string computername;
+	string username;
+
+	if (getenv ( "USERNAME" ) != NULL)
+		username = getenv ( "USERNAME" );
+	if (getenv ( "COMPUTERNAME" ) != NULL)
+		computername = getenv ( "COMPUTERNAME" );
+	else if (getenv ( "HOSTNAME" ) != NULL)
+		computername = getenv ( "HOSTNAME" );
 
-	string username = getenv ( "USERNAME" );
-	string computername = getenv ( "COMPUTERNAME" );
 	string vcproj_file_user = "";
 
 	if ((computername != "") && (username != ""))