diff --git a/rowers/templates/plannedsessioncreate.html b/rowers/templates/plannedsessioncreate.html
index fc6ac992..38f29545 100644
--- a/rowers/templates/plannedsessioncreate.html
+++ b/rowers/templates/plannedsessioncreate.html
@@ -130,7 +130,7 @@
 						<a class="small" href="/rowers/sessions/{{ ps.id }}/templateedit/">Edit Template</a>
 					</td>
           <td>
-            <a class="small" href="/rowers/sessions/{{ ps.id }}/deleteconfirm/">Delete</a>
+            <a class="small" href="/rowers/sessions/{{ ps.id }}/deleteconfirm/?next={{ request.path|urlencode }}">Delete</a>
           </td>
 	</tr>
 	{% endfor %}
diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py
index 48985c74..b5ec6dad 100644
--- a/rowers/views/planviews.py
+++ b/rowers/views/planviews.py
@@ -1502,7 +1502,8 @@ def plannedsession_teamclone_view(request,id=0):
     next = request.GET.get('next', url)
     return HttpResponseRedirect(next)
 
-@user_passes_test(hasplannedsessions, login_url="/rowers/paidplans/",
+@permission_required('plannedsession.change_session',fn=get_session_by_pk,raise_exception=True)
+@user_passes_test(can_plan, login_url="/rowers/paidplans/",
 message="This functionality requires a Coach or Self-Coach plan",
 redirect_field_name=None)
 def plannedsession_templateedit_view(request,id=0):
@@ -1989,8 +1990,9 @@ class PlannedSessionDelete(DeleteView):
             w.save()
 
         url = reverse(plannedsessions_view)
+        next = self.request.GET.get('next',url)
 
-        return url
+        return next
 
     def get_object(self, *args, **kwargs):
         obj = super(PlannedSessionDelete, self).get_object(*args, **kwargs)