diff --git a/cookbook/views/edit.py b/cookbook/views/edit.py
index 6a1583387..01cb16c3c 100644
--- a/cookbook/views/edit.py
+++ b/cookbook/views/edit.py
@@ -71,7 +71,8 @@ def internal_recipe_update(request, pk):
     ingredients = RecipeIngredients.objects.filter(recipe=recipe_instance)
 
     return render(request, 'forms/edit_internal_recipe.html',
-                  {'form': form, 'ingredients': json.dumps(list(ingredients.values())), 'view_url': reverse('view_recipe', args=[pk])})
+                  {'form': form, 'ingredients': json.dumps(list(ingredients.values())),
+                   'view_url': reverse('view_recipe', args=[pk])})
 
 
 class SyncUpdate(LoginRequiredMixin, UpdateView):
@@ -163,6 +164,12 @@ class CommentUpdate(LoginRequiredMixin, UpdateView):
 
     # TODO add msg box
 
+    def get_object(self, *args, **kwargs):
+        obj = super(CommentUpdate, self).get_object(*args, **kwargs)
+        if not obj.created_by == self.request.user:
+            return obj # TODO move to dispatch or build custom exception
+        return obj
+
     def get_success_url(self):
         return reverse('edit_comment', kwargs={'pk': self.object.pk})