diff --git a/SlicerConfiguration/Settings/ProfileManager.cs b/SlicerConfiguration/Settings/ProfileManager.cs
index 183588f03..4989de97e 100644
--- a/SlicerConfiguration/Settings/ProfileManager.cs
+++ b/SlicerConfiguration/Settings/ProfileManager.cs
@@ -89,7 +89,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 
 		private static string GetProfilesDirectoryForUser(string userName)
 		{
-			string userProfilesDirectory = Path.Combine(ApplicationDataStorage.ApplicationUserDataPath, "Profiles", userName);
+			string userAndEnvName = (userName == "guest") ? userName : ApplicationController.EnvironmentName + userName;
+			string userProfilesDirectory = Path.Combine(ApplicationDataStorage.ApplicationUserDataPath, "Profiles", userAndEnvName);
 
 			// Ensure directory exists
 			Directory.CreateDirectory(userProfilesDirectory);