diff --git a/src/common/connection.py b/src/common/connection.py
index edd53ee4ab443028743987f7e6612b30c5dfe21f..4359fffff56a83e208d229b94b6d327b31402df5 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -1024,7 +1024,7 @@ class Connection(CommonConnection, ConnectionHandlers):
                 proxy = {}
                 proxyptr = gajim.config.get_per('proxies', p)
                 for key in proxyptr.keys():
-                    proxy[key] = proxyptr[key][1]
+                    proxy[key] = proxyptr[key]
             else:
                 proxy = None
             use_srv = True
diff --git a/src/common/helpers.py b/src/common/helpers.py
index ce902b0071a8666bb400079e443a3d897a220754..a98110009b49ee82b22e10cccb3ecb80b2b1ea98 100644
--- a/src/common/helpers.py
+++ b/src/common/helpers.py
@@ -1435,7 +1435,7 @@ def get_proxy_info(account):
         if not proxyptr:
             return proxy
         for key in proxyptr.keys():
-            proxy[key] = proxyptr[key][1]
+            proxy[key] = proxyptr[key]
         return proxy
 
 def _get_img_direct(attrs):
diff --git a/src/config.py b/src/config.py
index dc597d5663db639178a9e304f30afda85030866d..6f95fd215fef88d6cdb917d514162a5c4131416b 100644
--- a/src/config.py
+++ b/src/config.py
@@ -1485,8 +1485,7 @@ class ManageProxiesWindow:
         gajim.config.del_per('proxies', old_name)
         gajim.config.add_per('proxies', new_name)
         for option in config:
-            gajim.config.set_per('proxies', new_name, option,
-                    config[option][common.config.OPT_VAL])
+            gajim.config.set_per('proxies', new_name, option, config[option])
         model.set_value(iter_, 0, new_name)
 
     def on_proxytype_combobox_changed(self, widget):
@@ -2116,7 +2115,7 @@ class AccountsWindow:
             gajim.config.add_per('accounts', new_name)
             old_config = gajim.config.get_per('accounts', old_name)
             for opt in old_config:
-                gajim.config.set_per('accounts', new_name, opt, old_config[opt][1])
+                gajim.config.set_per('accounts', new_name, opt, old_config[opt])
             gajim.config.del_per('accounts', old_name)
             if self.current_account == old_name:
                 self.current_account = new_name