diff --git a/TGServerService/App.config b/TGServerService/App.config
index 603b9d8c0a..6eb925f561 100644
--- a/TGServerService/App.config
+++ b/TGServerService/App.config
@@ -61,6 +61,9 @@
             <setting name="ReattachCommsKey" serializeAs="String">
                 <value />
             </setting>
+            <setting name="Webclient" serializeAs="String">
+                <value>False</value>
+            </setting>
         </TGServerService.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/TGServerService/DreamDaemon.cs b/TGServerService/DreamDaemon.cs
index 888b1779dd..4b10718376 100644
--- a/TGServerService/DreamDaemon.cs
+++ b/TGServerService/DreamDaemon.cs
@@ -380,7 +380,7 @@ namespace TGServerService
 
 					GenCommsKey();
 					StartingSecurity = (TGDreamDaemonSecurity)Config.ServerSecurity;
-					Proc.StartInfo.Arguments = String.Format("{0} -port {1} -close -verbose -params \"server_service={3}&server_service_version={4}\" -{2} -public", DMB, Config.ServerPort, SecurityWord(), serviceCommsKey, Version());
+					Proc.StartInfo.Arguments = String.Format("{0} -port {1} {5}-close -verbose -params \"server_service={3}&server_service_version={4}\" -{2} -public", DMB, Config.ServerPort, SecurityWord(), serviceCommsKey, Version(), Config.Webclient ? "-webclient" : "");
 					InitInterop();
 					Proc.Start();
 
diff --git a/TGServerService/Properties/Settings.Designer.cs b/TGServerService/Properties/Settings.Designer.cs
index a43d305401..2f61b72c1b 100644
--- a/TGServerService/Properties/Settings.Designer.cs
+++ b/TGServerService/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace TGServerService.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.1.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -226,5 +226,17 @@ namespace TGServerService.Properties {
                 this["ReattachCommsKey"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool Webclient {
+            get {
+                return ((bool)(this["Webclient"]));
+            }
+            set {
+                this["Webclient"] = value;
+            }
+        }
     }
 }
diff --git a/TGServerService/Properties/Settings.settings b/TGServerService/Properties/Settings.settings
index 0fa83c24e8..d28e35faa8 100644
--- a/TGServerService/Properties/Settings.settings
+++ b/TGServerService/Properties/Settings.settings
@@ -53,5 +53,8 @@
     <Setting Name="ReattachCommsKey" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="Webclient" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file