diff --git a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterHostInstaller.wixproj b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterHostInstaller.wixproj
index 9eb5dfe..41d4af9 100644
--- a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterHostInstaller.wixproj
+++ b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterHostInstaller.wixproj
@@ -30,6 +30,7 @@
     <Compile Include="DirectoryStructure.wxs" />
     <Compile Include="NLog.wxs" />
     <Compile Include="Product.wxs" />
+    <Compile Include="Properties.wxs" />
     <Compile Include="SQLiteRepository.wxs" />
     <Compile Include="WebPages.wxs" />
   </ItemGroup>
diff --git a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterServiceComponents.wxs b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterServiceComponents.wxs
index fbe3d18..6d18551 100644
--- a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterServiceComponents.wxs
+++ b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterServiceComponents.wxs
@@ -2,6 +2,8 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 	<Fragment>
+    <PropertyRef Id="STARTSERVICEONINSTALL"/>
+    
     <ComponentGroup Id="DataCenterComponents">
       <ComponentRef Id="URLReservation"/>
       <ComponentRef Id="DataCenterFirewallConfig"/>
@@ -175,12 +177,17 @@
                               ResetPeriodInDays="1"
                               RestartServiceDelayInSeconds="10" />
         </ServiceInstall>
+      </Component>
+      <Component Id="StartDataCenterServiceOnInsall" 
+                 Guid="{884828DC-A47E-4CEF-AEEB-E46FFDFFBED3}"
+                 KeyPath="yes">
         <ServiceControl Id="FlexitimeDataCenterStarter"
                         Start="install"
                         Stop="uninstall"
                         Remove="uninstall"
                         Name="FlexitimeDataCenterService"
-                        Wait="yes" />
+                        Wait="yes"/>
+        <Condition><![CDATA[STARTSERVICEONINSTALL <> "false"]]></Condition>
       </Component>
       <Component Id="WindowsDataCenterExeConfig" Guid="{CBFA53EB-0663-4A79-9990-451FC1105A12}">
         <File Id="WindowsDataCenter.exe.config"
@@ -195,5 +202,5 @@
               Checksum="yes"/>
       </Component>
     </ComponentGroup>
-	</Fragment>
+  </Fragment>
 </Wix>
diff --git a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/Properties.wxs b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/Properties.wxs
new file mode 100644
index 0000000..a7c1387
--- /dev/null
+++ b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/Properties.wxs
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<Fragment>
+    <Property Id="STARTSERVICEONINSTALL" Value="false" />
+	</Fragment>
+</Wix>