diff --git a/src/common/config.py b/src/common/config.py
index 8d3ca6b21..1fd333f47 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -226,7 +226,7 @@ class Config:
 			'http_auth': [opt_str, 'ask'], # yes, no, ask
 			# proxy65 for FT
 			'file_transfer_proxies': [opt_str, 
-			'proxy.jabber.org, proxy65.jabber.autocom.pl, proxy.jabber.cd.chalmers.se, proxy.netlab.cz, proxy65.jabber.ccc.de'],
+			'proxy.jabber.org, proxy.netlab.cz, transfer.jabber.freenet.de, proxy65.jabber.ccc.de, proxy65.jabber.autocom.pl, proxy.jabber.cd.chalmers.se'],
 			'msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide
 			'msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide
 			'msgwin-width': [opt_int, 480],
diff --git a/src/common/proxy65_manager.py b/src/common/proxy65_manager.py
index 17cd2577d..12e94c9ea 100644
--- a/src/common/proxy65_manager.py
+++ b/src/common/proxy65_manager.py
@@ -72,12 +72,11 @@ class Proxy65Manager:
 				raise common.xmpp.NodeProcessed
 	
 	def error_cb(self, proxy, query):
-		if not self.proxies.has_key(proxy):
-			return
-		resolver = self.proxies[proxy]
 		sid = query.getAttr('sid')
-		if resolver.sid == sid:
-			resolver.keep_conf()
+		for resolver in self.proxies.values():
+			if resolver.sid == sid:
+				resolver.keep_conf()
+				break
 	
 	def get_proxy(self, proxy):
 		if self.proxies.has_key(proxy):