diff --git a/opentech/apply/activity/views.py b/opentech/apply/activity/views.py
index f2c69bca1ee5216d0c39721974f6044ffafa10bc..07ccbd32c0358a21384d9ac4eab48519af0808e9 100644
--- a/opentech/apply/activity/views.py
+++ b/opentech/apply/activity/views.py
@@ -73,4 +73,4 @@ class CommentFormView(DelegatedViewMixin, CreateView):
     @classmethod
     def contribute_form(cls, instance, user):
         # We dont want to pass the submission as the instance
-        return super().contribute_form(None, user=user)
+        return super().contribute_form(instance=None, user=user)
diff --git a/opentech/apply/utils/views.py b/opentech/apply/utils/views.py
index a8dfda0d3f079b463e7c3c85b9b2223761607020..1cd79277d148c4b15a67c4ab7ffa1563ab909d08 100644
--- a/opentech/apply/utils/views.py
+++ b/opentech/apply/utils/views.py
@@ -134,7 +134,10 @@ class DelegatedViewMixin(View):
         return cls.context_name, form
 
     def get_success_url(self):
-        return self.request.path
+        query = self.request.GET.urlencode()
+        if query:
+            query = '?' + query
+        return self.request.path + query
 
 
 class CreateOrUpdateView(SingleObjectTemplateResponseMixin, ModelFormMixin, ProcessFormView):