diff --git a/src/Installer/Installer.wixproj b/src/Installer/Installer.wixproj
index d66c42e..ca48c5a 100644
--- a/src/Installer/Installer.wixproj
+++ b/src/Installer/Installer.wixproj
@@ -89,9 +89,16 @@
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
     <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
   </Target>
- 
   <PropertyGroup>
-    <PostBuildEvent>if $(ConfigurationName) == EVSignedRelease ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(EVCSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)") else ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(CSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)")</PostBuildEvent>
+    <PostBuildEvent>if $(ConfigurationName) == EVSignedRelease (
+                    "C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(EVCSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)"
+) else (
+    if $(ConfigurationName) == MicrosoftSignedRelease (
+                    "C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(EVCSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)"
+    ) else (
+                    "C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(CSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)"
+    )
+)</PostBuildEvent>
   </PropertyGroup>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/src/Lithnet.ActiveDirectory.PasswordProtection.sln b/src/Lithnet.ActiveDirectory.PasswordProtection.sln
index e2e44ff..eec1cd1 100644
--- a/src/Lithnet.ActiveDirectory.PasswordProtection.sln
+++ b/src/Lithnet.ActiveDirectory.PasswordProtection.sln
@@ -61,8 +61,8 @@ Global
 		{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.EVSignedRelease|x86.Build.0 = Release|x86
 		{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|Any CPU.ActiveCfg = Release|x64
 		{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|Any CPU.Build.0 = Release|x64
-		{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|x64.ActiveCfg = EVSignedRelease|x64
-		{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|x64.Build.0 = EVSignedRelease|x64
+		{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|x64.ActiveCfg = MicrosoftSignedRelease|x64
+		{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|x64.Build.0 = MicrosoftSignedRelease|x64
 		{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|x86.ActiveCfg = Release|x86
 		{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.MicrosoftSignedRelease|x86.Build.0 = Release|x86
 		{F42EF09F-7AB1-484B-BF80-72D455E9E9E4}.Release|Any CPU.ActiveCfg = Release|x86