diff --git a/RosBE-Windows/RosBE.nsi b/RosBE-Windows/RosBE.nsi
index 6a8e90d..f9bfe1d 100644
--- a/RosBE-Windows/RosBE.nsi
+++ b/RosBE-Windows/RosBE.nsi
@@ -290,6 +290,8 @@ Section Uninstall
     RMDir /r /REBOOTOK "$INSTDIR\4.1.3"
     RMDir /r /REBOOTOK "$INSTDIR\Tools"
     RMDir /r /REBOOTOK "$SMPROGRAMS\$ICONS_GROUP"
+    IfFileExists "$APPDATA\RosBE\." 0 +2
+        RMDir /r /REBOOTOK "$APPDATA\RosBE"
     Delete /REBOOTOK "$INSTDIR\Build.cmd"
     Delete /REBOOTOK "$INSTDIR\chdefdir.cmd"
     Delete /REBOOTOK "$INSTDIR\chdefgcc.cmd"
diff --git a/RosBE-Windows/RosSourceDir.nsh b/RosBE-Windows/RosSourceDir.nsh
index 98f1990..fa29510 100644
--- a/RosBE-Windows/RosSourceDir.nsh
+++ b/RosBE-Windows/RosSourceDir.nsh
@@ -6,7 +6,7 @@
 
     Function RosDir.show
         !insertmacro MUI_HEADER_TEXT "Select ReactOS Source Location" "Select the directory where the ReactOS sources are located or will be checked out to later."
-        !insertmacro INSTALLOPTIONS_WRITE "RosSourceDir.ini" "Field 2" "State" "$APPDATA\RosBE\Source"
+        !insertmacro INSTALLOPTIONS_WRITE "RosSourceDir.ini" "Field 2" "State" "$PROFILE\reactos"
         !insertmacro INSTALLOPTIONS_DISPLAY "RosSourceDir.ini"
     FunctionEnd