diff --git a/CSM/ConanServerManager_1.1.80.exe b/CSM/ConanServerManager_1.1.80.exe
new file mode 100644
index 00000000..e4dd1832
Binary files /dev/null and b/CSM/ConanServerManager_1.1.80.exe differ
diff --git a/CSM/ConanServerManager_1.1.80.zip b/CSM/ConanServerManager_1.1.80.zip
new file mode 100644
index 00000000..b8d733d3
Binary files /dev/null and b/CSM/ConanServerManager_1.1.80.zip differ
diff --git a/CSM/VersionFeed.xml b/CSM/VersionFeed.xml
index 6ab7234f..49e0990e 100644
--- a/CSM/VersionFeed.xml
+++ b/CSM/VersionFeed.xml
@@ -5,7 +5,38 @@
   <title>Conan Server Manager Version Feed</title>
   <subtitle>This is the Conan Server Manager release version feed.</subtitle>
   <link href="https://servermanagers.freeforums.net/" />
-  <updated>2022-07-15T00:00:00Z</updated>
+  <updated>2022-08-08T00:00:00Z</updated>
+
+  <entry>
+    <id>urn:uuid:6D1F49A0-06E6-415F-AA92-AACD598BC50C</id>
+    <title>1.1.80 (1.1.80.6)</title>
+    <summary>1.1.80.6</summary>
+    <link href="" />
+    <updated>2022-08-08T00:00:00Z</updated>
+    <content type="xhtml">
+      <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
+        <p>
+          <u style="font-size: .9em;">BUGFIX</u>
+          <br/>
+          <ul>
+            <li>Automatic Management - fixed a bug with the shutdown server day selection. Both Shutdown 1 and Shutdown 2 days would affect each other, now they are independant.</li>
+          </ul>
+          <u style="font-size: .9em;">CHANGE</u>
+          <br/>
+          <ul>
+            <li>Server Details Section - added new option to use the Conan Testlive Dedicated Server files. This new option will switch the steam application id of the server files to use the Conan Testlive Dedicated Server files, instead of the Conan Dedicated Server files.</li>
+            <li>Server Update - updated the code to determine which set of dedicated server files (Conan or Conan Testlive) is required when performing server and mod file updates. Separate Cache folders will be maintained for each.</li>
+            <li>Automatic Management - rearranged the options so they are grouped correctly.</li>
+            <li>Auto-Start Server Option - added a new option selection for on Boot and on Login.</li>
+          </ul>
+        </p>
+      </div>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
 
   <entry>
     <id>urn:uuid:8CDA70CF-E8B8-4B9B-AD50-AD9A8B528E5B</id>
diff --git a/CSM/en-US.xaml b/CSM/en-US.xaml
index eb88689f..6b648d20 100644
--- a/CSM/en-US.xaml
+++ b/CSM/en-US.xaml
@@ -957,6 +957,11 @@
     <sys:String x:Key="GlobalSettings_TaskPriority_AutoShutdownLabel">Auto Shutdown/Restart Task Priority:</sys:String>
     <sys:String x:Key="GlobalSettings_TaskPriority_AutoStartLabel">Auto Start Task Priority:</sys:String>
 
+    <sys:String x:Key="GlobalSettings_TaskSchedulerUsernameLabel">Task Scheduler Username:</sys:String>
+    <sys:String x:Key="GlobalSettings_TaskSchedulerUsernameTooltip">This username will be used for the Auto-Start server on Boot task.</sys:String>
+    <sys:String x:Key="GlobalSettings_TaskSchedulerPasswordLabel">Task Scheduler Password:</sys:String>
+    <sys:String x:Key="GlobalSettings_TaskSchedulerPasswordTooltip">This password will be used for the Auto-Start server on Boot task.</sys:String>
+
     <sys:String x:Key="GlobalSettings_ResetSettings_ConfirmTitle">Confirm Settings Reset Action</sys:String>
     <sys:String x:Key="GlobalSettings_ResetSettings_ConfirmLabel">Click 'Yes' to confirm you want to perform the settings reset.</sys:String>
     <sys:String x:Key="GlobalSettings_ResetSettings_FailedTitle">Failed to Reset Settings</sys:String>
@@ -1237,8 +1242,12 @@
     <sys:String x:Key="ServerSettings_AutomaticManagementLabel">Automatic Management</sys:String>
     <sys:String x:Key="ServerSettings_NoAutoManagementButtonLabel">Why can't I use this?</sys:String>
     <sys:String x:Key="ServerSettings_ServerManagerSettingsLabel">Server Manager Settings</sys:String>
-    <sys:String x:Key="ServerSettings_AutoStartLabel">Auto-Start server on boot</sys:String>
-    <sys:String x:Key="ServerSettings_AutoStartTooltip">Automatically start the server when the machine starts.</sys:String>
+    <sys:String x:Key="ServerSettings_AutoStartServerLabel">Auto-Start server</sys:String>
+    <sys:String x:Key="ServerSettings_AutoStartServerTooltip">Automatically start the server.</sys:String>
+    <sys:String x:Key="ServerSettings_AutoStartServerOnBootLabel">on Boot</sys:String>
+    <sys:String x:Key="ServerSettings_AutoStartServerOnBootTooltip">Start the server when the machine starts.</sys:String>
+    <sys:String x:Key="ServerSettings_AutoStartServerOnLoginLabel">on Login</sys:String>
+    <sys:String x:Key="ServerSettings_AutoStartServerOnLoginTooltip">Start the server when the user logs in.</sys:String>
     <sys:String x:Key="ServerSettings_EnableAutoShutdownLabel">Shutdown server at</sys:String>
     <sys:String x:Key="ServerSettings_EnableAutoShutdownTooltip">The hour and minute of the day to force a server shutdown.</sys:String>
     <sys:String x:Key="ServerSettings_RestartAfterShutdownLabel">then restart</sys:String>
@@ -1250,7 +1259,7 @@
     <sys:String x:Key="ServerSettings_PeriodicUpdatesLabel">Include server in the Auto-Update cycle</sys:String>
     <sys:String x:Key="ServerSettings_PeriodicUpdatesTooltip">If enabled, the server will be periodically updated during the Auto-Update cycle. See the settings for Auto-Update options.</sys:String>
     <sys:String x:Key="ServerSettings_RestartIfShutdownLabel">Restart server if shutdown</sys:String>
-    <sys:String x:Key="ServerSettings_RestartIfShutdownTooltip">If enabled, the server will be restarted even if shutdown for Auto-Restarts and Auto-Updates.</sys:String>
+    <sys:String x:Key="ServerSettings_RestartIfShutdownTooltip">If enabled, the server will be restarted even if shutdown for Auto-Updates.</sys:String>
     <!--#endregion-->
 
     <!--#region Server Settings - Discord Bot Details -->
@@ -1276,6 +1285,9 @@
     <!--#region Server Settings - Server Details -->
     <sys:String x:Key="ServerSettings_ServerDetailsLabel">Server Details</sys:String>
 
+    <sys:String x:Key="ServerSettings_UseTestliveLabel">Use Testlive Dedicated Server Files</sys:String>
+    <sys:String x:Key="ServerSettings_UseTestliveTooltip">If enabled, will use the testlive dedicated server files instead of the testlive branch. Leave the branch as default, do not set to Testlive.</sys:String>
+    
     <sys:String x:Key="ServerSettings_BranchLabel">Branch Details</sys:String>
     <sys:String x:Key="ServerSettings_BranchNameLabel">Branch Name:</sys:String>
     <sys:String x:Key="ServerSettings_BranchNameTooltip">The name of the branch to download (leave blank to use the release branch).</sys:String>
diff --git a/CSM/latest.exe b/CSM/latest.exe
index 488340a4..e4dd1832 100644
Binary files a/CSM/latest.exe and b/CSM/latest.exe differ
diff --git a/CSM/latest.txt b/CSM/latest.txt
index d81c2ebf..7ce6fa77 100644
--- a/CSM/latest.txt
+++ b/CSM/latest.txt
@@ -1 +1 @@
-1.1.79
+1.1.80
diff --git a/CSM/latest.zip b/CSM/latest.zip
index 45cc636a..b8d733d3 100644
Binary files a/CSM/latest.zip and b/CSM/latest.zip differ