diff --git a/src/gui/src/AppConfig.cpp b/src/gui/src/AppConfig.cpp
index a94fadae..2054e0a3 100644
--- a/src/gui/src/AppConfig.cpp
+++ b/src/gui/src/AppConfig.cpp
@@ -54,7 +54,7 @@ AppConfig::AppConfig(QSettings* settings) :
 	m_WizardLastRun(0),
 	m_CryptoPass(),
 	m_ProcessMode(DEFAULT_PROCESS_MODE),
-	m_AutoConfig(false),
+	m_AutoConfig(true),
 	m_ElevateMode(false),
 	m_AutoConfigPrompted(false)
 {
@@ -124,7 +124,7 @@ void AppConfig::loadSettings()
 	m_CryptoEnabled = settings().value("cryptoEnabled", false).toBool();
 	m_Language = settings().value("language", QLocale::system().name()).toString();
 	m_StartedBefore = settings().value("startedBefore", false).toBool();
-	m_AutoConfig = settings().value("autoConfig", false).toBool();
+	m_AutoConfig = settings().value("autoConfig", true).toBool();
 	m_ElevateMode = settings().value("elevateMode", false).toBool();
 	m_AutoConfigPrompted = settings().value("autoConfigPrompted", false).toBool();
 }
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 84a3d49e..6afb4682 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -1111,23 +1111,7 @@ void MainWindow::installBonjour()
 
 void MainWindow::promptAutoConfig()
 {
-	if (isBonjourRunning()) {
-		int r = QMessageBox::question(
-			this, tr("Synergy"),
-			tr("Do you want to enable auto config?\n\n"
-			   "This feature helps you establish the connection."),
-			QMessageBox::Yes | QMessageBox::No);
-
-		if (r == QMessageBox::Yes) {
-			m_AppConfig.setAutoConfig(true);
-			m_pCheckBoxAutoConfig->setChecked(true);
-		}
-		else {
-			m_AppConfig.setAutoConfig(false);
-			m_pCheckBoxAutoConfig->setChecked(false);
-		}
-	}
-	else {
+	if (!isBonjourRunning()) {
 		int r = QMessageBox::question(
 			this, tr("Synergy"),
 			tr("Do you want to enable auto config and install Bonjour?\n\n"