diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py
index 4c03378c..dc9627eb 100644
--- a/src/bitmessageqt/__init__.py
+++ b/src/bitmessageqt/__init__.py
@@ -2171,12 +2171,10 @@ class MyForm(QtGui.QMainWindow):
             shared.config.set('bitmessagesettings', 'willinglysendtomobile', str(
                 self.settingsDialogInstance.ui.checkBoxWillinglySendToMobile.isChecked()))
                 
-            
             lang_ind = int(self.settingsDialogInstance.ui.languageComboBox.currentIndex())
             if not languages[lang_ind] == 'other':
                 shared.config.set('bitmessagesettings', 'userlocale', languages[lang_ind])
-            
-            ###
+                
             curr_index = self.settingsDialogInstance.ui.comboBoxIdenticonStyle.currentIndex()
             shared.config.set('bitmessagesettings', 'identicon', str(self.settingsDialogInstance.ui.comboBoxIdenticonStyle.itemData(
                     curr_index , Qt.UserRole).toString()))
diff --git a/src/class_sqlThread.py b/src/class_sqlThread.py
index 34109172..9764e3c7 100644
--- a/src/class_sqlThread.py
+++ b/src/class_sqlThread.py
@@ -208,6 +208,13 @@ class sqlThread(threading.Thread):
 
         if not shared.config.has_option('bitmessagesettings', 'userlocale'):
             shared.config.set('bitmessagesettings', 'userlocale', 'system')
+        if not shared.config.has_option('bitmessagesettings', 'identicon'):
+            shared.config.set('bitmessagesettings', 'identicon', 'None')
+        if not shared.config.has_option('bitmessagesettings', 'identiconsuffix'):
+            import random, string
+            shared.config.set('bitmessagesettings', 'identiconsuffix', ''.join(random.choice("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz") for x in range(12))) # a twelve character pseudo-password to salt the identicons
+        if not shared.config.has_option('bitmessagesettings', 'avatars'):
+            shared.config.set('bitmessagesettings', 'avatars', 'false')
         if not shared.config.has_option('bitmessagesettings', 'sendoutgoingconnections'):
             shared.config.set('bitmessagesettings', 'sendoutgoingconnections', 'True')