diff --git a/src/dialogs.py b/src/dialogs.py
index 4a33df13c..ccfa8d205 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -120,7 +120,7 @@ class PreferencesDlg:
 			self.preferences.set("max_download_rate", self.glade.get_widget("spin_max_download").get_value())
 			self.preferences.set("proxy_port", self.glade.get_widget("spin_proxy_port").get_value())
 			self.preferences.set("max_connections", self.glade.get_widget("spin_max_connections").get_value())
-			self.preferences.set("max_number_torrents", self.glade.get_widget("spin_torrents").get_value())
+			self.preferences.set("max_active_torrents", int(self.glade.get_widget("spin_torrents").get_value()))
 			self.preferences.set("queue_seeds_to_bottom", self.glade.get_widget("chk_seedbottom").get_active())
 			self.preferences.set("enable_dht", self.glade.get_widget("chk_dht").get_active())
 			self.preferences.set("gui_update_interval", self.glade.get_widget("spin_gui").get_value())
diff --git a/src/pref.py b/src/pref.py
index a4e71d9c4..1fb09c179 100644
--- a/src/pref.py
+++ b/src/pref.py
@@ -52,11 +52,10 @@ DEFAULT_PREFS = {
 	"listen_on" : [6881,6889],
 	"lock_tray" : False,
 	"max_active_torrents" : -1,
-	"max_connections" : 80,
+	"max_connections" : 200,
 	"max_download_rate" : -1.0,
 	"max_download_rate_bps": -1.0,
 	"max_number_downloads" : -1.0,
-	"max_number_torrents" : -1.0,
 	"max_number_uploads" : -1.0,
 	"max_upload_rate" : -1.0,
 	"max_upload_rate_bps" : -1.0,