diff --git a/po/pantalaimon.thrrgilag.pot b/po/pantalaimon.thrrgilag.pot
index d5e0b9a..9c9b9b2 100644
--- a/po/pantalaimon.thrrgilag.pot
+++ b/po/pantalaimon.thrrgilag.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pantalaimon.thrrgilag\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-03 22:00+0000\n"
+"POT-Creation-Date: 2020-09-04 04:36+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/config.py b/src/config.py
index d0c223b..09d3aeb 100644
--- a/src/config.py
+++ b/src/config.py
@@ -21,8 +21,8 @@ def load():
             item['listenaddress'] = config[instance].get('listenaddress')
             item['listenport'] = config[instance].get('listenport')
             item['proxy'] = config[instance].get('proxy')
-            item['ssl'] = config[instance].getboolean('ssl')
-            item['ignoreverification'] = config[instance].get('ignoreverification')
+            item['ssl'] = config[instance].getboolean('ssl', True)
+            item['ignoreverification'] = config[instance].getboolean('ignoreverification', True)
             item['usekeyring'] = config[instance].get('usekeyring')
 
             entries.append(item)
@@ -40,15 +40,18 @@ def save(data):
             sslval = 'true'
         else:
             sslval = 'false'
+
         config[item['name']] = {}
         config[item['name']]['homeserver'] = item['homeserver']
         config[item['name']]['listenaddress'] = "127.0.0.1"
         config[item['name']]['listenport'] = item['listenport']
-        config[item['name']]['proxy'] = item['proxy']
         config[item['name']]['ssl'] = sslval
         config[item['name']]['ignoreverification'] = "true"
         config[item['name']]['usekeyring'] = "false"
 
+        if len(item['proxy']) > 0:
+            config[item['name']]['proxy'] = item['proxy']
+
     if not os.path.exists(CONFDIR):
         os.makedirs(CONFDIR)