diff --git a/src/gui/src/AboutDialogBase.ui b/src/gui/src/AboutDialogBase.ui
index b20e3a50..b2cbe5e1 100644
--- a/src/gui/src/AboutDialogBase.ui
+++ b/src/gui/src/AboutDialogBase.ui
@@ -52,7 +52,7 @@
      <property name="text">
       <string>&lt;p&gt;
 Keyboard and mouse sharing application. Cross platform and open source.&lt;br /&gt;&lt;br /&gt;
-Copyright © 2012-2016 Symless Ltd.&lt;br /&gt;
+Copyright © 2012-2019 Symless Ltd.&lt;br /&gt;
 Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.&lt;br /&gt;&lt;br /&gt;
 Synergy is released under the GNU General Public License (GPLv2).&lt;br /&gt;&lt;br /&gt;
 Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.&lt;br /&gt;
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 499ca99b..33c89ae4 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -140,6 +140,8 @@ MainWindow::MainWindow (QSettings& settings, AppConfig& appConfig,
     // hide padlock icon
     secureSocket(false);
 
+    sslToggled(appConfig.getCryptoEnabled());
+
     connect (this, SIGNAL(windowShown()),
              this, SLOT(on_windowShown()), Qt::QueuedConnection);
 #ifndef SYNERGY_ENTERPRISE
@@ -1104,12 +1106,6 @@ void MainWindow::setEdition(Edition edition)
 #ifndef SYNERGY_ENTERPRISE
     setWindowTitle(m_LicenseManager->getEditionName (edition));
 #endif
-    if (m_AppConfig->getCryptoEnabled()) {
-        m_pSslCertificate = new SslCertificate(this);
-        m_pSslCertificate->generateCertificate();
-    }
-    updateLocalFingerprint();
-    saveSettings();
 }
 
 #ifndef SYNERGY_ENTERPRISE
diff --git a/src/gui/src/SslCertificate.cpp b/src/gui/src/SslCertificate.cpp
index 777d4fd4..ffa77b7e 100644
--- a/src/gui/src/SslCertificate.cpp
+++ b/src/gui/src/SslCertificate.cpp
@@ -34,8 +34,8 @@ static const char kSslDir[] = "SSL";
 static const char kUnixOpenSslCommand[] = "openssl";
 
 #if defined(Q_OS_WIN)
-static const char kWinOpenSslBinary[] = "OpenSSL\\openssl.exe";
-static const char kConfigFile[] = "OpenSSL\\synergy.conf";
+static const char kWinOpenSslBinary[] = "openssl.exe";
+static const char kConfigFile[] = "synergy.conf";
 #endif
 
 SslCertificate::SslCertificate(QObject *parent) :