diff --git a/U3H_appStart.ahk b/U3H_appStart.ahk
index bdaba19..f896075 100644
--- a/U3H_appStart.ahk
+++ b/U3H_appStart.ahk
@@ -1,6 +1,11 @@
-EnvSet USERPROFILE, % EnvValue("U3_APP_DATA_PATH")
-EnvSet HOMEPATH, % EnvValue("U3_APP_DATA_PATH")
-EnvSet APPDATA, % EnvValue("U3_APP_DATA_PATH") . "\Application Data"
+EnvSet USERPROFILE, %U3_APP_DATA_PATH%
+
+; %HOMEPATH% is without drive letter and colon, do it also here
+EnvGet eSystemDrive, SystemDrive
+StringReplace eHOMEPATH, U3_APP_DATA_PATH, %eSystemDrive%
+EnvSet HOMEPATH, %U3_APP_DATA_PATH%
+EnvSet HOMEDRIVE, % EnvValue("U3_DEVICE_PATH")
+EnvSet APPDATA, % U3_APP_DATA_PATH . "\Application Data"
 
 ; add custom PATH directories
 EnvGet ePATH, PATH