diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py
index c820b2ae..05910fbc 100644
--- a/rowers/views/planviews.py
+++ b/rowers/views/planviews.py
@@ -445,8 +445,9 @@ def plannedsession_create_view(request,
     sps = get_sessions(r,startdate=startdate,enddate=enddate).exclude(
                 sessiontype='race')
 
-
-    sessiontemplates = PlannedSession.objects.filter(manager=request.user,is_template=True)
+    sessiontemplates = PlannedSession.objects.filter(
+        manager=request.user,
+        is_template=True).order_by("name")
 
     try:
         trainingplan = TrainingPlan.objects.filter(
@@ -1511,11 +1512,11 @@ def plannedsession_teamclone_view(request,id=0):
         ps.name += ' (copy)'
     ps.is_template = False
 
-    deltadays = ps.enddate-ps.startdate
+    deltadays = ps.preferreddate-ps.startdate
 
-    ps.startdate = timezone.now().date()
-    ps.enddate = (timezone.now()+deltadays).date()
-    ps.preferreddate = ps.preferreddate+deltadays
+    ps.startdate = startdate
+    ps.enddate = enddate
+    ps.preferreddate = startdate+deltadays
 
     ps.save()