diff --git a/goals/templates/goals/_form_submit.html b/goals/templates/goals/_form_submit.html
index fad15c1..319c629 100644
--- a/goals/templates/goals/_form_submit.html
+++ b/goals/templates/goals/_form_submit.html
@@ -8,8 +8,10 @@
     {{ my_goals_formset.non_form_errors }}
 
 	{% for form, item in my_goals_formset|zip:goals.item_goal.all %}
-		{% render_field form.id %}
-		{% render_field form.item %}
+		{% for hidden in form.hidden_fields %}
+	        {{ hidden }}
+	    {% endfor %}
+		
 		{{ form.errors }}
     			
 		{% if form.instance.pk %}{{ form.DELETE }}{% endif %}
diff --git a/goals/views.py b/goals/views.py
index 08856df..25951ec 100644
--- a/goals/views.py
+++ b/goals/views.py
@@ -410,7 +410,7 @@ class UpdateSubmit(LoginRequiredMixin, LogMixin, generic.UpdateView):
 		goals = get_object_or_404(Goals, slug = slug)
 
 		MyGoalsFormset = modelformset_factory(MyGoals, form = MyGoalsForm, extra = 0)
-		my_goals_formset = MyGoalsFormset()
+		my_goals_formset = MyGoalsFormset(queryset = MyGoals.objects.filter(user = request.user, item__goal = goals))
 		
 		return self.render_to_response(self.get_context_data(my_goals_formset = my_goals_formset))
 
@@ -424,7 +424,7 @@ class UpdateSubmit(LoginRequiredMixin, LogMixin, generic.UpdateView):
 		goals = get_object_or_404(Goals, slug = slug)
 
 		MyGoalsFormset = modelformset_factory(MyGoals, form = MyGoalsForm, extra = 0)
-		my_goals_formset = MyGoalsFormset(self.request.POST)
+		my_goals_formset = MyGoalsFormset(self.request.POST, queryset = MyGoals.objects.filter(user = request.user, item__goal = goals))
 		
 		if (my_goals_formset.is_valid()):
 			return self.form_valid(my_goals_formset)
--
libgit2 0.21.2