diff --git a/Duplicati/Server/Database/ServerSettings.cs b/Duplicati/Server/Database/ServerSettings.cs
index 342a86199..7755d51e5 100644
--- a/Duplicati/Server/Database/ServerSettings.cs
+++ b/Duplicati/Server/Database/ServerSettings.cs
@@ -338,7 +338,6 @@ namespace Duplicati.Server.Database
             }
 
             SaveSettings();
-            GenerateWebserverPasswordTrayIcon();
         }
 
         public void SetAllowedHostnames(string allowedHostnames)
diff --git a/Duplicati/Server/Program.cs b/Duplicati/Server/Program.cs
index c547f9cdd..e22dcaba1 100644
--- a/Duplicati/Server/Program.cs
+++ b/Duplicati/Server/Program.cs
@@ -236,13 +236,16 @@ namespace Duplicati.Server
                 StartOrStopUsageReporter();
 
                 if (commandlineOptions.ContainsKey("webservice-password"))
-                    Program.DataConnection.ApplicationSettings.SetWebserverPassword(commandlineOptions["webservice-password"]);
+                {
+                    DataConnection.ApplicationSettings.SetWebserverPassword(commandlineOptions["webservice-password"]);
+                }
 
-                Program.DataConnection.ApplicationSettings.GenerateWebserverPasswordTrayIcon();
+                DataConnection.ApplicationSettings.GenerateWebserverPasswordTrayIcon();
 
                 if (commandlineOptions.ContainsKey("webservice-allowed-hostnames"))
-                    Program.DataConnection.ApplicationSettings.SetAllowedHostnames(commandlineOptions["webservice-allowed-hostnames"]);
-
+                {
+                    DataConnection.ApplicationSettings.SetAllowedHostnames(commandlineOptions["webservice-allowed-hostnames"]);
+                }
 
                 ApplicationExitEvent = new System.Threading.ManualResetEvent(false);