diff --git a/ChangeLog b/ChangeLog
index 738400860..a21706c0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-1.1.0
+1.1.1
+-----
+1. Fix crash in settings dialog if current connection name is removed from
+   config file.
+
+1.1.0
 -----
  1. Display 'Calculating...', and 'Deleting...' in cache settings page if
     relevant.
diff --git a/gui/serversettings.cpp b/gui/serversettings.cpp
index 453f09b1e..b08f837f3 100644
--- a/gui/serversettings.cpp
+++ b/gui/serversettings.cpp
@@ -68,6 +68,7 @@ class CollectionNameValidator : public QValidator
 ServerSettings::ServerSettings(QWidget *p)
     : QWidget(p)
     , haveBasicCollection(false)
+    , prevIndex(0)
 {
     setupUi(this);
     #if defined ENABLE_DEVICES_SUPPORT