diff --git a/installer/windows/CustomInstallDir.wxs b/installer/windows/CustomInstallDir.wxs
index 19e63a2d5..f460b4373 100644
--- a/installer/windows/CustomInstallDir.wxs
+++ b/installer/windows/CustomInstallDir.wxs
@@ -60,7 +60,7 @@ Patch dialog sequence:
NOT Installed OR NOT WIX_UPGRADE_DETECTED
Installed AND PATCH AND NOT WIX_UPGRADE_DETECTED
- NOT Installed AND WIX_UPGRADE_DETECTED
+ NOT Installed AND WIX_UPGRADE_DETECTED
1
LicenseAccepted = "1"
@@ -115,7 +115,7 @@ Patch dialog sequence:
NOT Installed AND NOT WIX_UPGRADE_DETECTED
Installed AND NOT PATCH AND NOT WIX_UPGRADE_DETECTED
- Installed AND PATCH OR WIX_UPGRADE_DETECTED
+ Installed AND PATCH AND NOT WIX_UPGRADE_DETECTED
1
diff --git a/installer/windows/StorjValidateUpgradeDlg.wxs b/installer/windows/StorjValidateUpgradeDlg.wxs
new file mode 100644
index 000000000..af89190e4
--- /dev/null
+++ b/installer/windows/StorjValidateUpgradeDlg.wxs
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+ (NOT Installed OR PATCH) AND WIX_UPGRADE_DETECTED
+
+
+
+
diff --git a/installer/windows/StorjWelcomeDlg.wxs b/installer/windows/StorjWelcomeDlg.wxs
index 60f3b8a4e..2eeb828e7 100644
--- a/installer/windows/StorjWelcomeDlg.wxs
+++ b/installer/windows/StorjWelcomeDlg.wxs
@@ -16,44 +16,39 @@
-
-
- WIX_UPGRADE_DETECTED
- NOT WIX_UPGRADE_DETECTED
-
-
+
- (NOT Installed OR NOT PATCH) AND NOT WIX_UPGRADE_DETECTED
- (Installed AND PATCH) OR WIX_UPGRADE_DETECTED
+ NOT Installed OR NOT PATCH
+ Installed AND PATCH
- (NOT Installed OR NOT PATCH) AND NOT WIX_UPGRADE_DETECTED
- (Installed AND PATCH) OR WIX_UPGRADE_DETECTED
+ NOT Installed OR NOT PATCH
+ Installed AND PATCH
- (NOT Installed OR NOT PATCH) AND NOT WIX_UPGRADE_DETECTED
- (Installed AND PATCH) OR WIX_UPGRADE_DETECTED
+ NOT Installed OR NOT PATCH
+ Installed AND PATCH
- (NOT Installed OR NOT PATCH) AND NOT WIX_UPGRADE_DETECTED
- (Installed AND PATCH) OR WIX_UPGRADE_DETECTED
+ NOT Installed OR NOT PATCH
+ Installed AND PATCH
- (NOT Installed OR NOT PATCH) AND NOT WIX_UPGRADE_DETECTED
- (Installed AND PATCH) OR WIX_UPGRADE_DETECTED
+ NOT Installed OR NOT PATCH
+ Installed AND PATCH
- (NOT Installed OR NOT PATCH) AND NOT WIX_UPGRADE_DETECTED
- (Installed AND PATCH) OR WIX_UPGRADE_DETECTED
+ NOT Installed OR NOT PATCH
+ Installed AND PATCH
Learn more]]>
- (NOT Installed OR NOT PATCH) AND NOT WIX_UPGRADE_DETECTED
- (Installed AND PATCH) OR WIX_UPGRADE_DETECTED
+ NOT Installed OR NOT PATCH
+ Installed AND PATCH
- (NOT Installed OR NOT PATCH) AND NOT WIX_UPGRADE_DETECTED
- (Installed AND PATCH) OR WIX_UPGRADE_DETECTED
+ NOT Installed OR NOT PATCH
+ Installed AND PATCH
@@ -64,7 +59,7 @@
- NOT Installed OR PATCH
+ (NOT Installed OR PATCH) AND NOT WIX_UPGRADE_DETECTED
diff --git a/installer/windows/windows.wixproj b/installer/windows/windows.wixproj
index 0e7b45ae8..b4fadd0b3 100644
--- a/installer/windows/windows.wixproj
+++ b/installer/windows/windows.wixproj
@@ -20,6 +20,7 @@
+