diff --git a/Installer Projects/CustomActions/CustomActions.cs b/Installer Projects/CustomActions/CustomActions.cs
index 2ecdf6a36..8d8c5f719 100644
--- a/Installer Projects/CustomActions/CustomActions.cs	
+++ b/Installer Projects/CustomActions/CustomActions.cs	
@@ -27,5 +27,34 @@ namespace CustomActions
             session.Log("End IsKBInstalled");
             return ActionResult.Success;
         }
+
+        [CustomAction]
+        public static ActionResult UninstallLegacyVersion(Session session)
+        {
+            session.Log("Begin UninstallLegacyVersion");
+            UninstallNSISVersions uninstaller = new UninstallNSISVersions();
+            string uninstallString = uninstaller.GetLegacyUninstallString();
+            uninstaller.UninstallLegacyVersion();
+            session.Log("End UninstallLegacyVersion");
+            return ActionResult.Success;
+        }
+
+        [CustomAction]
+        public static ActionResult IsLegacyVersionInstalled(Session session)
+        {
+            session.Log("Begin IsLegacyVersionInstalled");
+            UninstallNSISVersions uninstaller = new UninstallNSISVersions();
+            if (uninstaller.IsLegacymRemoteNGInstalled())
+            {
+                session["LEGACYVERSIONINSTALLED"] = "1";
+            }
+            else
+            {
+                session["LEGACYVERSIONINSTALLED"] = "0";
+            }
+
+            session.Log("End IsLegacyVersionInstalled");
+            return ActionResult.Success;
+        }
     }
 }
\ No newline at end of file
diff --git a/Installer Projects/CustomActions/CustomActions.csproj b/Installer Projects/CustomActions/CustomActions.csproj
index c24e2fced..ce2277102 100644
--- a/Installer Projects/CustomActions/CustomActions.csproj	
+++ b/Installer Projects/CustomActions/CustomActions.csproj	
@@ -33,7 +33,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <StartupObject />
+    <StartupObject>
+    </StartupObject>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -46,6 +47,7 @@
     <Compile Include="CustomActions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="InstalledWindowsUpdateGatherer.cs" />
+    <Compile Include="UninstallNSISVersions.cs" />
     <Content Include="CustomAction.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/Installer Projects/CustomActions/UninstallNSISVersions.cs b/Installer Projects/CustomActions/UninstallNSISVersions.cs
new file mode 100644
index 000000000..17866ade2
--- /dev/null
+++ b/Installer Projects/CustomActions/UninstallNSISVersions.cs	
@@ -0,0 +1,75 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.Win32;
+using System.Diagnostics;
+using System.IO;
+
+namespace CustomActions
+{
+    public class UninstallNSISVersions
+    {
+        private const string REGISTRY_PATH = "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\mRemoteNG";
+        private const string REGISTRY_PATH_Wow6432 = "Software\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\mRemoteNG";
+        private RegistryKey _activeRegistryPath;
+
+
+        public UninstallNSISVersions()
+        {
+            GetLegacymRemoteNGRegistryKeyPath();
+        }
+
+        public void UninstallLegacyVersion()
+        {
+            if (!IsLegacymRemoteNGInstalled())
+                return;
+            string uninstallString = GetLegacyUninstallString();
+            ProcessStartInfo processStartInfo = new ProcessStartInfo(uninstallString);
+            processStartInfo.UseShellExecute = true;
+            processStartInfo.Arguments = string.Format("_?={0}", uninstallString.Replace("Uninstall.exe", "").Replace(@"""", ""));
+            Process uninstallProcess = Process.Start(processStartInfo);
+            while (uninstallProcess.HasExited == false)
+            {
+                Debug.WriteLine("Waiting for uninstaller to exit");
+            }
+        }
+
+        public bool IsLegacymRemoteNGInstalled()
+        {
+            return (_activeRegistryPath != null);
+        }
+
+        public string GetLegacyUninstallString()
+        {
+            if (IsLegacymRemoteNGInstalled())
+                return _activeRegistryPath.GetValue("UninstallString").ToString();
+            return "";
+        }
+
+        private void GetLegacymRemoteNGRegistryKeyPath()
+        {
+            GetUninstallKeyPath();
+            GetUninstallKeyPath6432();
+        }
+
+        private void GetUninstallKeyPath()
+        {
+            try
+            {
+                _activeRegistryPath = Registry.LocalMachine.OpenSubKey(REGISTRY_PATH);
+            }
+            catch (Exception ex)
+            { }
+        }
+
+        private void GetUninstallKeyPath6432()
+        {
+            try
+            {
+                _activeRegistryPath = Registry.LocalMachine.OpenSubKey(REGISTRY_PATH_Wow6432);
+            }
+            catch (Exception ex)
+            { }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Installer Projects/Installer/CustomActions/UninstallLegacyVersions.wxs b/Installer Projects/Installer/CustomActions/UninstallLegacyVersions.wxs
new file mode 100644
index 000000000..65dc0d172
--- /dev/null
+++ b/Installer Projects/Installer/CustomActions/UninstallLegacyVersions.wxs	
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include $(sys.CURRENTDIR)Includes\Config.wxi?>
+	<Fragment>
+    <CustomAction Id="CheckIfLegacyVersionInstalled" Return="check" Execute="immediate" BinaryKey="CustomActions.CA.dll" DllEntry="IsLegacyVersionInstalled" />
+	</Fragment>
+  <Fragment>
+    <CustomAction Id="UninstallLegacyVersion" Return="check" Execute="immediate" BinaryKey="CustomActions.CA.dll" DllEntry="UninstallLegacyVersion" />
+  </Fragment>
+</Wix>
\ No newline at end of file
diff --git a/Installer Projects/Installer/Installer.wixproj b/Installer Projects/Installer/Installer.wixproj
index 8f3a1f9fe..e5c926bdc 100644
--- a/Installer Projects/Installer/Installer.wixproj	
+++ b/Installer Projects/Installer/Installer.wixproj	
@@ -27,6 +27,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="CustomActions\CheckForInstalledWindowsUpdates.wxs" />
+    <Compile Include="CustomActions\UninstallLegacyVersions.wxs" />
     <Compile Include="Fragments\FilesFragment.wxs" />
     <Compile Include="Fragments\DirectoriesFragment.wxs" />
     <Compile Include="Fragments\MainExeFragment.wxs" />
diff --git a/Installer Projects/Installer/mRemoteNGV1.wxs b/Installer Projects/Installer/mRemoteNGV1.wxs
index 991c1c1e2..7889f333b 100644
--- a/Installer Projects/Installer/mRemoteNGV1.wxs	
+++ b/Installer Projects/Installer/mRemoteNGV1.wxs	
@@ -17,13 +17,17 @@
       <RegistrySearch Id='mRemoteNGRegistry' Type='raw' Root='HKLM' Key='Software\mRemoteNG' Name='InstallDir' />
     </Property>
     <Property Id='REQUIREDDOTNETFRAMEWORKVERSION' Value='$(var.RequiredDotNetFrameworkVersion)' />
+    <Property Id='LEGACYVERSIONINSTALLED' Value='0' />
     <PropertyRef Id="NETFRAMEWORK40FULL" />
     <PropertyRef Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" />
     <Icon Id="mRemoteNG.ico" SourceFile="Resources\mRemoteNG.ico" />
 
     <InstallUISequence>
       <Custom Action="SetRDP80KBValue" After="AppSearch" />
-      <Custom Action="CheckIfRDP80Installed" After="SetRDP80KBValue">NOT Installed AND (VersionNT = 601 OR VersionNT64 = 601)</Custom>
+      <Custom Action="CheckIfRDP80Installed" After="SetRDP80KBValue">(NOT Installed) AND (VersionNT = 601 OR VersionNT64 = 601)</Custom>
+      <LaunchConditions After="SetWIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" />
+      <Custom Action="CheckIfLegacyVersionInstalled" After="LaunchConditions" />
+      <Custom Action="UninstallLegacyVersion" After="CheckIfLegacyVersionInstalled">(NOT Installed) AND (LEGACYVERSIONINSTALLED = 1)</Custom>
     </InstallUISequence>