diff --git a/templates/mailman-django/lists/settings.html b/templates/mailman-django/lists/settings.html
index 174090a..d882f8c 100644
--- a/templates/mailman-django/lists/settings.html
+++ b/templates/mailman-django/lists/settings.html
@@ -25,7 +25,7 @@
     <p id="message">{{ message }}</p>
 {% endif %}
 
-<form action="{% url list_settings fqdn_listname %}" method="post" class="list_settings">
+<form action="{% url list_settings fqdn_listname %}?section={{visible_section}}&option={{visible_option}}" method="post" class="list_settings">
 {{ form.as_div }}
 
     <div class="field">
diff --git a/views.py b/views.py
index b29b12a..64da277 100644
--- a/views.py
+++ b/views.py
@@ -301,14 +301,11 @@
     """
     message = ""
     #check for GET values
-    try:
-        visible_section=request.GET["section"]
-    except:
-        visible_section=None
-    try: 
-        visible_option=request.GET["option"]
-    except:
-        visible_option=None
+    try:   visible_section=request.GET["section"]
+    except:visible_section=None
+    try:   visible_option=request.GET["option"]
+    except:visible_option=None
+    
     #Create the Connection
     try:
         c = Client('http://localhost:8001/3.0', API_USER, API_PASS)
@@ -338,7 +335,10 @@
         #raise Exception(form)#debug
     return render_to_response(template, {'form': form,
                                          'message': message,
-                                         'fqdn_listname': the_list.settings['fqdn_listname']})
+                                         'fqdn_listname': the_list.settings['fqdn_listname'],
+                                         'visible_option':visible_option,
+                                         'visible_section':visible_section,
+                                         })
 
 @login_required
 def mass_subscribe(request, fqdn_listname = None,