diff --git a/urls.py b/urls.py
index d3a2bb9..06ea5c2 100644
--- a/urls.py
+++ b/urls.py
@@ -34,8 +34,8 @@
     url(r'^subscriptions/(?P<fqdn_listname>[^/]+)/(?:(?P<option>subscribe|unsubscribe)?)(/(?P<user_email>.+))?$', 'list_subscriptions', name = 'list_subscriptions'),#public
     url(r'^subscriptions/(?P<fqdn_listname>[^/]+)/mass_subscribe/$', 'mass_subscribe', name = 'mass_subscribe'),#admin
     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'),
+    url(r'^user_settings/$', 'user_settings', kwargs={"tab": "user"}, name = 'user_settings'),
+    url(r'^membership_settings/$', 'user_settings', kwargs={"tab": "membership"}, name = 'membership_settings'), #todo improve regexp of above 2 urls
     #url(r'^settings/(?P<fqdn_listname>[^/]+)/(?P<visible_section>[^/]+)?/(?P<visible_option>.+)?$', 'list_settings', name = 'list_settings'),
     url(r'^settings/(?P<fqdn_listname>[^/]+)/(?P<visible_section>[^/]+)?(?:/(?P<visible_option>.*))?$', 'list_settings', name = 'list_settings'),    
     ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)#https://docs.djangoproject.com/en/dev/howto/static-files/#serving-static-files-in-production
diff --git a/views.py b/views.py
index aadcc7e..c73c469 100644
--- a/views.py
+++ b/views.py
@@ -391,7 +391,7 @@
                                          ,context_instance=RequestContext(request))
 
 @login_required
-def user_settings(request, member = None, tab = "user",
+def user_settings(request, tab = "user",
                   template = 'mailman-django/user_settings.html'):
     """
     Change the user or the membership settings.
@@ -400,12 +400,16 @@
           * add missing functionality in REST server and client and 
             change to the correct calls here
     """
+    member = request.user.username
     message = ""
     membership_lists = []
     fqdn_listname = ""
     try:
         c = Client('http://localhost:8001/3.0', API_USER, API_PASS)
-        user_object = c.get_user(member)
+        for user in c.members[member]:
+            raise Exception(user)
+        user_object = ""
+        raise Exception(user_object)
         # address_choices for the 'address' field must be a list of 
         # tuples of length 2
         address_choices = [[addr, addr] for addr in user_object.get_email_addresses()]