diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Actions/EntServerActionManager.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Actions/EntServerActionManager.cs
index b0e7673a..f1d608b8 100644
--- a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Actions/EntServerActionManager.cs
+++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Actions/EntServerActionManager.cs
@@ -33,6 +33,7 @@ using System.Linq;
 using System.ServiceProcess;
 using System.Text;
 using System.IO;
+using System.Text.RegularExpressions;
 using System.Xml;
 
 namespace WebsitePanel.Setup.Actions
@@ -443,6 +444,66 @@ namespace WebsitePanel.Setup.Actions
             Log.WriteEnd(string.Format("Updated {0}.config file (connection string)", Global.Parameters.SchedulerServiceFileName));
         }
     }
+
+    public class SaveSchedulerServiceCryptoKeyAction : Action, IInstallAction
+    {
+        void IInstallAction.Run(SetupVariables vars)
+        {
+            Log.WriteStart(string.Format("Updating {0}.config file (crypto key)", Global.Parameters.SchedulerServiceFileName));
+
+            try
+            {
+                UpdateCryptoKey(vars.InstallationFolder);
+            }
+            catch (Exception)
+            {
+            }
+
+            Log.WriteEnd(string.Format("Updated {0}.config file (connection string)", Global.Parameters.SchedulerServiceFileName));
+        }
+
+        private static void UpdateCryptoKey(string installFolder)
+        {
+            string path = Path.Combine(installFolder, "web.config");
+            string cryptoKey = "0123456789";
+
+            if (File.Exists(path))
+            {
+                using (var reader = new StreamReader(path))
+                {
+                    string content = reader.ReadToEnd();
+                    var pattern = new Regex(@"(?<=<add key=""WebsitePanel.CryptoKey"" .*?value\s*=\s*"")[^""]+(?="".*?>)");
+                    Match match = pattern.Match(content);
+                    cryptoKey = match.Value;
+                }
+            }
+
+            ChangeConfigString("installer.cryptokey", cryptoKey, installFolder);
+        }
+
+        private static void ChangeConfigString(string searchString, string replaceValue, string installFolder)
+        {
+            string path = Path.Combine(installFolder, "bin", string.Format("{0}.config", Global.Parameters.SchedulerServiceFileName));
+
+            if (File.Exists(path))
+            {
+                string content;
+
+                using (var reader = new StreamReader(path))
+                {
+                    content = reader.ReadToEnd();
+                }
+
+                var re = new Regex("\\$\\{" + searchString + "\\}+", RegexOptions.IgnoreCase);
+                content = re.Replace(content, replaceValue);
+
+                using (var writer = new StreamWriter(path))
+                {
+                    writer.Write(content);
+                }
+            }
+        }
+    }
     
 	public class SaveEntServerConfigSettingsAction : Action, IInstallAction
 	{
@@ -488,6 +549,7 @@ namespace WebsitePanel.Setup.Actions
 			new SaveComponentConfigSettingsAction(),
 			new SaveEntServerConfigSettingsAction(),
             new SaveSchedulerServiceConnectionStringAction(),
+            new SaveSchedulerServiceCryptoKeyAction(),
             new InstallSchedulerServiceAction()
 		};
 
diff --git a/WebsitePanel/build.xml b/WebsitePanel/build.xml
index c42ca019..6f1125bf 100644
--- a/WebsitePanel/build.xml
+++ b/WebsitePanel/build.xml
@@ -306,10 +306,7 @@
 			<Output
                 TaskParameter="TargetOutputs"
                 ItemName="WebsitePanelInstallerMsi" />	
-		</MSBuild>
-		
-		<XmlUpdate XmlFileName="$(RootFolder)\WebsitePanel\Sources\WebsitePanel.SchedulerService\Bin\WebsitePanel.SchedulerService.exe.config" Xpath="//configuration/connectionStrings/add/@connectionString" Value="${installer.connectionstring}"  />		
-		<XmlUpdate XmlFileName="$(RootFolder)\WebsitePanel\Sources\WebsitePanel.SchedulerService\Bin\WebsitePanel.SchedulerService.exe.config" Xpath="//configuration/appSettings/add[@key=%22WebsitePanel.CryptoKey%22]/@value" Value="${installer.cryptokey}"  />		
+		</MSBuild>		
 		
 		<MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\WebsitePanel.SchedulerServiceInstaller\WebsitePanel.SchedulerServiceInstaller.csproj" Properties="Configuration=$(BuildConfiguration);DefineSolutionProperties=false"/>
 		
@@ -378,6 +375,7 @@
 		<Copy SourceFiles="@(EnterpriseServerDeployFiles)" DestinationFolder="$(EnterpriseServerInstall)\%(RecursiveDir)" />
 		<XmlUpdate XmlFileName="$(EnterpriseServerInstall)\web.config" Xpath="//configuration/connectionStrings/add/@connectionString" Value="${installer.connectionstring}"  />
 		<XmlUpdate XmlFileName="$(EnterpriseServerInstall)\bin\WebsitePanel.SchedulerService.exe.config" Xpath="//configuration/connectionStrings/add/@connectionString" Value="${installer.connectionstring}"  />
+		<XmlUpdate XmlFileName="$(EnterpriseServerInstall)\bin\WebsitePanel.SchedulerService.exe.config" Xpath="//configuration/appSettings/add[@key=%22WebsitePanel.CryptoKey%22]/@value" Value="${installer.cryptokey}"  />
 		<XmlUpdate XmlFileName="$(EnterpriseServerInstall)\web.config" Xpath="//configuration/appSettings/add[@key=%22WebsitePanel.CryptoKey%22]/@value" Value="${installer.cryptokey}"  />		
 	</Target>