diff --git a/Foundation/src/Path_WIN32.cpp b/Foundation/src/Path_WIN32.cpp
index 259c7c1ab..ba0465b57 100644
--- a/Foundation/src/Path_WIN32.cpp
+++ b/Foundation/src/Path_WIN32.cpp
@@ -55,15 +55,15 @@ std::string PathImpl::systemImpl()
 std::string PathImpl::homeImpl()
 {
 	std::string result;
-	if (EnvironmentImpl::hasImpl("HOMEDRIVE") && EnvironmentImpl::hasImpl("HOMEPATH"))
+	if (EnvironmentImpl::hasImpl("USERPROFILE"))
+	{
+		result = EnvironmentImpl::getImpl("USERPROFILE");
+	}
+	else if (EnvironmentImpl::hasImpl("HOMEDRIVE") && EnvironmentImpl::hasImpl("HOMEPATH"))
 	{
 		result = EnvironmentImpl::getImpl("HOMEDRIVE");
 		result.append(EnvironmentImpl::getImpl("HOMEPATH"));
 	}
-	else if (EnvironmentImpl::hasImpl("USERPROFILE"))
-	{
-		result = EnvironmentImpl::getImpl("USERPROFILE");
-	}
 	else
 	{
 		result = systemImpl();
diff --git a/Foundation/src/Path_WIN32U.cpp b/Foundation/src/Path_WIN32U.cpp
index 799231717..0c37063ff 100644
--- a/Foundation/src/Path_WIN32U.cpp
+++ b/Foundation/src/Path_WIN32U.cpp
@@ -65,15 +65,15 @@ std::string PathImpl::systemImpl()
 std::string PathImpl::homeImpl()
 {
 	std::string result;
-	if (EnvironmentImpl::hasImpl("HOMEDRIVE") && EnvironmentImpl::hasImpl("HOMEPATH"))
+	if (EnvironmentImpl::hasImpl("USERPROFILE"))
+	{
+		result = EnvironmentImpl::getImpl("USERPROFILE");
+	}
+	else if (EnvironmentImpl::hasImpl("HOMEDRIVE") && EnvironmentImpl::hasImpl("HOMEPATH"))
 	{
 		result = EnvironmentImpl::getImpl("HOMEDRIVE");
 		result.append(EnvironmentImpl::getImpl("HOMEPATH"));
 	}
-	else if (EnvironmentImpl::hasImpl("USERPROFILE"))
-	{
-		result = EnvironmentImpl::getImpl("USERPROFILE");
-	}
 	else
 	{
 		result = systemImpl();