diff --git a/ChangeLog b/ChangeLog
index c1a39a9f2..6790c95ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Enhancements:
 
 Bug fixes:
 - #7182 Remove unused TLS options from the GUI on Synergy Client
+- #7186 There are no additional TLS options for all users setting
 ===========
 
 v1.14.4-rc
diff --git a/src/gui/src/AppConfig.cpp b/src/gui/src/AppConfig.cpp
index 8529a6124..aa0123386 100644
--- a/src/gui/src/AppConfig.cpp
+++ b/src/gui/src/AppConfig.cpp
@@ -275,6 +275,8 @@ void AppConfig::saveSettings()
 {
     setCommonSetting(kWizardLastRun, m_WizardLastRun);
     setCommonSetting(kLoadSystemSettings, m_LoadFromSystemScope);
+    setCommonSetting(kGroupClientCheck, m_ClientGroupChecked);
+    setCommonSetting(kGroupServerCheck, m_ServerGroupChecked);
 
     if (isWritable()) {
         setSetting(kScreenName, m_ScreenName);
@@ -299,11 +301,9 @@ void AppConfig::saveSettings()
         setSetting(kLastExpireWarningTime, m_LastExpiringWarningTime);
         setSetting(kActivationHasRun, m_ActivationHasRun);
         setSetting(kMinimizeToTray, m_MinimizeToTray);
-        setSetting(kGroupServerCheck, m_ServerGroupChecked);
         setSetting(kUseExternalConfig, m_UseExternalConfig);
         setSetting(kConfigFile, m_ConfigFile);
         setSetting(kUseInternalConfig, m_UseInternalConfig);
-        setSetting(kGroupClientCheck, m_ClientGroupChecked);
         setSetting(kServerHostname, m_ServerHostname);
         setSetting(kPreventSleep, m_PreventSleep);
         setSetting(kLanguageSync, m_LanguageSync);
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index c3ed522cd..a4ba08d42 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -1530,12 +1530,14 @@ void MainWindow::on_m_pRadioGroupServer_clicked(bool)
 {
     enableServer(true);
     enableClient(false);
+    m_AppConfig->saveSettings();
 }
 
 void MainWindow::on_m_pRadioGroupClient_clicked(bool)
 {
     enableClient(true);
     enableServer(false);
+    m_AppConfig->saveSettings();
 }
 
 void MainWindow::on_m_pButtonConnect_clicked()