diff --git a/ChangeLog b/ChangeLog
index deb4ff812..bbbcd6013 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,9 +7,11 @@ Deluge 1.0.3 (18 October 2008)
     would cause the torrent to be rechecked on every startup.
   * Fix ip filtering
 
+ GtkUI:
+  * Re-add the "Max Connections Per Second" option with a default setting of 20
+
  WebUI:
   * Fix White template for Opera
-  * Remove max connections per second from config dialog.
  
  Misc:
   * Deluge will now use a system libtorrent library if available.
diff --git a/deluge/core/core.py b/deluge/core/core.py
index fac5d65c4..b2671f3be 100644
--- a/deluge/core/core.py
+++ b/deluge/core/core.py
@@ -838,10 +838,7 @@ class Core(
         self.session.set_max_half_open_connections(value)
         
     def _on_set_max_connections_per_second(self, key, value):
-        #self.settings.connection_speed = value
-        # We are hard-coding this value to 20 due to issues with having it
-        # unlimited by default.
-        self.settings.connection_speed = 20
+        self.settings.connection_speed = value
         self.session.set_settings(self.settings)
     
     def _on_ignore_limits_on_local_network(self, key, value):
diff --git a/deluge/ui/gtkui/glade/preferences_dialog.glade b/deluge/ui/gtkui/glade/preferences_dialog.glade
index 9ad4ae7ed..39ae92cae 100644
--- a/deluge/ui/gtkui/glade/preferences_dialog.glade
+++ b/deluge/ui/gtkui/glade/preferences_dialog.glade
@@ -1306,6 +1306,7 @@ Disabled</property>
                                             </child>
                                             <child>
                                               <widget class="GtkLabel" id="label58">
+                                                <property name="visible">True</property>
                                                 <property name="xalign">0</property>
                                                 <property name="label" translatable="yes">Maximum Connection Attempts per Second:</property>
                                               </widget>
@@ -1333,6 +1334,7 @@ Disabled</property>
                                             </child>
                                             <child>
                                               <widget class="GtkSpinButton" id="spin_max_connections_per_second">
+                                                <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="xalign">1</property>
                                                 <property name="adjustment">-1 -1 9999 1 10 10</property>
diff --git a/deluge/ui/webui/config_tabs_deluge.py b/deluge/ui/webui/config_tabs_deluge.py
index fe523a6e5..ad5aca76a 100644
--- a/deluge/ui/webui/config_tabs_deluge.py
+++ b/deluge/ui/webui/config_tabs_deluge.py
@@ -105,7 +105,7 @@ class BandwithGlobal(config_forms.CfgForm):
     max_upload_slots_global = forms.DelugeInt(_("Maximum Upload Slots"))
 
     max_half_open_connections = forms.DelugeInt(_("Maximum Half-Open Connections"))
-    #max_connections_per_second = forms.DelugeInt(_("Maximum Connection Attempts per Second"))
+    max_connections_per_second = forms.DelugeInt(_("Maximum Connection Attempts per Second"))
     ignore_limits_on_local_network = forms.CheckBox("Ignore limits on local network")