diff --git a/.gitignore b/.gitignore
index 19b5c4cd21..3d7836f12a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,7 @@ config/active.dat
 config/config.json
 /plugins
 
-# Enteprise imports file
+# Enterprise imports file
 imports/imports.go
 
 # Build Targets
@@ -37,6 +37,7 @@ imports/imports.go
 _obj
 _test
 .vscode
+testfiles
 
 # Architecture specific extensions/prefixes
 [568vq].out
diff --git a/config/client.go b/config/client.go
index 261b5abeef..f78af9ee81 100644
--- a/config/client.go
+++ b/config/client.go
@@ -46,6 +46,7 @@ func GenerateClientConfig(c *model.Config, diagnosticID string, license *model.L
 	props["EnableSVGs"] = strconv.FormatBool(*c.ServiceSettings.EnableSVGs)
 	props["EnableMarketplace"] = strconv.FormatBool(*c.PluginSettings.EnableMarketplace)
 	props["EnableLatex"] = strconv.FormatBool(*c.ServiceSettings.EnableLatex)
+	props["ExtendSessionLengthWithActivity"] = strconv.FormatBool(*c.ServiceSettings.ExtendSessionLengthWithActivity)
 
 	// This setting is only temporary, so keep using the old setting name for the mobile and web apps
 	props["ExperimentalEnablePostMetadata"] = "true"