diff --git a/cockatrice/src/dlg_connect.cpp b/cockatrice/src/dlg_connect.cpp
index f13b2f8f..152d62b9 100644
--- a/cockatrice/src/dlg_connect.cpp
+++ b/cockatrice/src/dlg_connect.cpp
@@ -34,8 +34,7 @@ DlgConnect::DlgConnect(QWidget *parent)
     savePasswordCheckBox = new QCheckBox(tr("&Save password"));
     savePasswordCheckBox->setChecked(settings.value("save_password", 1).toInt());
 
-    //autoConnectCheckBox = new QCheckBox(tr("A&uto connect at start"));
-    autoConnectCheckBox = new QCheckBox("A&uto connect at start"); // TODO needs tr()
+    autoConnectCheckBox = new QCheckBox(tr("A&uto connect at start"));
     if(savePasswordCheckBox->isChecked())
     {
         autoConnectCheckBox->setChecked(settings.value("auto_connect", 0).toInt());
@@ -76,12 +75,11 @@ DlgConnect::DlgConnect(QWidget *parent)
 
 void DlgConnect::passwordSaved(int state)
 {
-    if(!savePasswordCheckBox->isChecked())
-    {
+    if(savePasswordCheckBox->isChecked()) {
+       autoConnectCheckBox->setEnabled(true);
+    } else {
         autoConnectCheckBox->setChecked(0);
         autoConnectCheckBox->setEnabled(false);
-    } else {
-        autoConnectCheckBox->setEnabled(true);
     }
 }
 
@@ -104,7 +102,9 @@ void DlgConnect::actCancel()
 {
     QSettings settings;
     settings.beginGroup("server");
+    settings.setValue("save_password", savePasswordCheckBox->isChecked() ? 1 : 0);
     settings.setValue("auto_connect", autoConnectCheckBox->isChecked() ? 1 : 0);
     settings.endGroup();
+    
     reject();
 }
diff --git a/cockatrice/src/settingscache.cpp b/cockatrice/src/settingscache.cpp
index 92c06041..bc30a08b 100644
--- a/cockatrice/src/settingscache.cpp
+++ b/cockatrice/src/settingscache.cpp
@@ -49,7 +49,7 @@ SettingsCache::SettingsCache()
 
     ignoreUnregisteredUsers = settings->value("chat/ignore_unregistered", false).toBool();
 
-    attemptAutoConnect = settings->value("server/auto_connect", 0).toInt() == 0 ? false : true; 
+    attemptAutoConnect = settings->value("server/auto_connect", 0).toBool(); 
 }
 
 void SettingsCache::setLang(const QString &_lang)