diff --git a/rowers/templates/plannedsessionteamedit.html b/rowers/templates/plannedsessionteamedit.html
index b5623062..260af903 100644
--- a/rowers/templates/plannedsessionteamedit.html
+++ b/rowers/templates/plannedsessionteamedit.html
@@ -5,39 +5,41 @@
 {% block title %}New Planned Session{% endblock %}
 
 {% block main %}
-  <h1>Edit Session {{ plannedsession.name }}</h1>
 
-<ul class="main-content">
+<h1>Edit Session {{ plannedsession.name }}</h1>
+
+<form enctype="multipart/form-data" method="post">
+  <ul class="main-content">
     <li class="grid_4">
       <p>
         <table>
           {{ teamform.as_table }}
-      </table>
-        <table>
-          {{ rowersform.as_table }}
         </table>
-      </p>
-    </li>
-    <li class="grid_4">
+        <table>
+            {{ rowersform.as_table }}
+          </table>
+        </p>
+      </li>
+      <li class="grid_4">
+        <table>
+          {{ form.as_table }}
+        </table>
+        {% csrf_token %}
+        <p><input class="button" type="submit" value="Save" name="_save"></p>
+        <p><input class="button" type="submit" value="Save and Keep Editing" name="_continue"></p>
+        <p>
+          <a href="/rowers/sessions/{{ plannedsession.id }}/deleteconfirm"><i class="fas fa-trash-alt fa-fw"></i> Delete</a>
+        </p>
+        <p>
+          <a href="/rowers/sessions/{{ plannedsession.id }}/clone"><i class="fas fa-clone fa-fw"></i> Clone</a>
+        </p>
 
-      <table>
-        {{ form.as_table }}
-      </table>
-      <p><input class="button" type="submit" value="Save" name="_save"></p>
-      <p><input class="button" type="submit" value="Save and Keep Editing" name="_continue"></p>
-      <p>
-        <a href="/rowers/sessions/{{ plannedsession.id }}/deleteconfirm"><i class="fas fa-trash-alt fa-fw"></i> Delete</a>
-      </p>
-      <p>
-        <a href="/rowers/sessions/{{ plannedsession.id }}/clone"><i class="fas fa-clone fa-fw"></i> Clone</a>
-      </p>
+      <div id="id_guidance" class="padded">
 
-    <div id="id_guidance" class="padded">
-
-    </div>
-    </li>
-  </ul>
-</form>
+      </div>
+      </li>
+    </ul>
+  </form>
 {% endblock %}
 
 {% block scripts %}
diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py
index e6e6e567..4ed811b9 100644
--- a/rowers/views/planviews.py
+++ b/rowers/views/planviews.py
@@ -1097,6 +1097,10 @@ def plannedsession_teamedit_view(request,
 
     ps = get_object_or_404(PlannedSession,pk=id)
 
+    startdate,enddate = get_dates_timeperiod(request)
+
+    timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
+
     teams = Team.objects.filter(manager=request.user)
     teamchoices = [(team.id, team.name) for team in teams]
 
@@ -1185,6 +1189,7 @@ def plannedsession_teamedit_view(request,
 
             url = reverse('plannedsessions_view')
 
+
             if "_continue" in request.POST:
                 url = reverse(plannedsession_edit_view,
                             kwargs={
@@ -1192,10 +1197,9 @@ def plannedsession_teamedit_view(request,
                                 'userid':r.user.id,
                                 })
 
-                startdatestring = startdate.strftime('%Y-%m-%d')
-                enddatestring = enddate.strftime('%Y-%m-%d')
-                url += '?when='+startdatestring+'/'+enddatestring
 
+
+            url = url+'?when='+timeperiod
             return HttpResponseRedirect(url)
     else:
         sessioncreateform = PlannedSessionForm(instance=ps)
@@ -1977,9 +1981,8 @@ def plannedsession_edit_view(request,id=0,userid=0):
 
     r = getrequestplanrower(request,userid=userid)
 
-
-
     startdate,enddate = get_dates_timeperiod(request)
+    timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
 
 
     try:
@@ -1997,6 +2000,7 @@ def plannedsession_edit_view(request,id=0,userid=0):
                       kwargs={
                           'id':id,
                           })
+        url = url+"?when="+timeperiod
         return HttpResponseRedirect(url)
 
     if request.method == 'POST':