diff -r 4d98832b43ba -r 7781c2836d3c app/soc/views/models/base.py
--- a/app/soc/views/models/base.py	Mon Nov 10 00:39:50 2008 +0000
+++ b/app/soc/views/models/base.py	Mon Nov 10 00:40:15 2008 +0000
@@ -142,8 +142,13 @@
     for field in fields:
       kwargs[field] = None
 
-    # TODO(SRabbelier): make edit strip off 'create' if present and replace with 'edit'
-    return self.edit(request, page=page, params=params, **kwargs)
+    request.path = helper.requests.replaceSuffix(request.path,
+                                                 old_suffix='create')
+    request.path = helper.requests.replaceSuffix(request.path,
+                                                 old_suffix='edit',
+                                                 new_suffix='edit')
+
+    return self.edit(request, page=page, **kwargs)
 
   def edit(self, request, page=None, params=None, **kwargs):
     """Displays the public page for the entity specified by **kwargs