diff --git a/urls.py b/urls.py
index f4968d7..b301a88 100644
--- a/urls.py
+++ b/urls.py
@@ -27,7 +27,7 @@
     url(r'^lists/new/$', 'list_new', name = 'list_new'),
     url(r'^lists/logout/$', 'logout', name = 'logout'),
     url(r'^lists/(?P<fqdn_listname>[^/]+)/$', 'list_summary', name = 'list_summary'),
-    url(r'^lists/(?P<fqdn_listname>[^/]+)/subscriptions/(?:(?P<option>subscribe|unsubscribe)?)$', 'list_subscriptions', name = 'list_subscriptions'),
+    url(r'^lists/(?P<fqdn_listname>[^/]+)/subscriptions/(?:(?P<option>subscribe|unsubscribe)?)(/(?P<user_email>.+))?$', 'list_subscriptions', name = 'list_subscriptions'),
     url(r'^delete_list/(?P<fqdn_listname>[^/]+)/$', 'list_delete', name = 'list_delete'),
     url(r'^user_settings/(?P<member>[^/]+)/$', 'user_settings', kwargs={"tab": "user"}, name = 'user_settings'),
     url(r'^membership_settings/(?P<member>[^/]+)/$', 'user_settings', kwargs={"tab": "membership"}, name = 'membership_settings'),
diff --git a/views.py b/views.py
index 55230df..0ec46bf 100644
--- a/views.py
+++ b/views.py
@@ -204,7 +204,8 @@
                                   {'fqdn_listname':fqdn_listname,
                                    'message':  "This Site is in preperation. +DEBUG"+fqdn_listname})#TODO
 
-def list_subscriptions(request, option=None, fqdn_listname=None, template = 'mailman-django/lists/subscriptions.html', *args, **kwargs):#TODO **only kwargs ?
+def list_subscriptions(request, option=None, fqdn_listname=None, user_email = None,
+                       template = 'mailman-django/lists/subscriptions.html', *args, **kwargs):#TODO **only kwargs ?
     """
     Display the information there is available for a list. This 
     function also enables subscribing or unsubscribing a user to a 
@@ -257,10 +258,10 @@
         # the request was a GET request so set the two forms to empty
         # forms
         if option=="subscribe" or not option:
-            form_subscribe = ListSubscribe(initial = {'fqdn_listname': fqdn_listname, 
+            form_subscribe = ListSubscribe(initial = {'fqdn_listname': fqdn_listname, 'email':user_email, 
                                              'name' : 'subscribe'})
         if option=="unsubscribe" or not option:                                             
-            form_unsubscribe = ListUnsubscribe(initial = {'fqdn_listname': fqdn_listname, 
+            form_unsubscribe = ListUnsubscribe(initial = {'fqdn_listname': fqdn_listname, 'email':user_email, 
                                                  'name' : 'unsubscribe'})
     listinfo = c.get_list(fqdn_listname)#TODO
     return render_to_response(template, {'form_subscribe': form_subscribe,