diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py
index d5434143..62f5bd92 100644
--- a/rowers/views/planviews.py
+++ b/rowers/views/planviews.py
@@ -2524,14 +2524,18 @@ def rower_view_instantplan(request,id='',userid=0):
                 'id':id,
                 })
             return HttpResponseRedirect(url)
-        form = InstantPlanSelectForm(request.POST)
+        form = InstantPlanSelectForm(request.POST,targets=targets)
 
 
         if form.is_valid():
             plansteps = response.json()
             name = form.cleaned_data['name']
             try:
-                target = form.cleaned_data['target']
+                targetid = form.cleaned_data['target']
+                if targetid != '':
+                    target = TrainingTarget.objects.get(id=int(targetid))
+                else:
+                    target = None
             except KeyError:
                 try:
                     targetid = request.POST['target']
@@ -2546,8 +2550,10 @@ def rower_view_instantplan(request,id='',userid=0):
             notes = form.cleaned_data['notes']
             datechoice = form.cleaned_data['datechoice']
             status = True
+
             if target and datechoice == 'target':
                 enddate = target.date
+                startdate = enddate-datetime.timedelta(days=plan.duration)
             elif datechoice == 'startdate':
                 enddate = startdate+datetime.timedelta(days=plan.duration)
             else: