diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebsitePanel.EnterpriseServer.Code.csproj b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebsitePanel.EnterpriseServer.Code.csproj
index 6b10906d..4cf6b00e 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebsitePanel.EnterpriseServer.Code.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebsitePanel.EnterpriseServer.Code.csproj
@@ -51,9 +51,6 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="WebsitePanel.Common.Utils">
-      <HintPath>..\..\Bin\WebsitePanel.Common.Utils.dll</HintPath>
-    </Reference>
     <Reference Include="WebsitePanel.EnterpriseServer.Base, Version=2.1.0.1, Culture=neutral, PublicKeyToken=da8782a6fc4d0081, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Bin\WebsitePanel.EnterpriseServer.Base.dll</HintPath>
@@ -178,6 +175,10 @@
     <Compile Include="Wizards\WebApplicationsInstaller.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\WebsitePanel.Common.Utils\WebsitePanel.Common.Utils.csproj">
+      <Project>{53D22D35-4013-415F-BA09-F67A0DBBB0C1}</Project>
+      <Name>WebsitePanel.Common.Utils</Name>
+    </ProjectReference>
     <ProjectReference Include="..\WebsitePanel.Templates\WebsitePanel.Templates.csproj">
       <Project>{387FA0EF-3927-45FF-8F8F-BCCD735540C6}</Project>
       <Name>WebsitePanel.Templates</Name>
diff --git a/WebsitePanel/build.xml b/WebsitePanel/build.xml
index d5d3bf4b..3c5ab989 100644
--- a/WebsitePanel/build.xml
+++ b/WebsitePanel/build.xml
@@ -329,6 +329,8 @@
 		<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 Projects="$(RootFolder)\WebsitePanel.Installer\Sources\WebsitePanel.SchedulerServiceInstaller\WebsitePanel.SchedulerServiceInstaller.csproj" Properties="Configuration=$(BuildConfiguration);DefineSolutionProperties=false"/>
+		
 		<MSBuild Projects="$(RootFolder)\WebsitePanel.Installer\Sources\Setup.SchedulerService\Setup.SchedulerService.wixproj" Properties="Configuration=$(BuildConfiguration);DefineSolutionProperties=false">
 			<Output
                 TaskParameter="TargetOutputs"