diff --git a/ofu_app/apps/food/models.py b/ofu_app/apps/food/models.py
index 941e1c2..c280761 100644
--- a/ofu_app/apps/food/models.py
+++ b/ofu_app/apps/food/models.py
@@ -115,9 +115,9 @@ class UserFoodImage(models.Model):
                                  content_type='image/jpg')
 
         str_food = smart_str(self.food.name, encoding='utf-8')
-        self.thumb.save('%s_%s_thumbnail.%s' % (str_food, self.user.username, 'jpg'), suf, save=False)
+        self.thumb.save('%s_%s_thumbnail.%s' % (str_food, self.user.id, 'jpg'), suf, save=False)
         # save the image object
-        self.image.name = "%s_%s_original.%s" % (self.food.id, 'jpg')
+        self.image.name = "%s_%s_original.%s" % (str_food, self.user.id, 'jpg')
         super(UserFoodImage, self).save(force_update, force_insert)
 
     def delete(self, using=None, keep_parents=False):
diff --git a/ofu_app/apps/food/views.py b/ofu_app/apps/food/views.py
index affa0b9..c05b446 100644
--- a/ofu_app/apps/food/views.py
+++ b/ofu_app/apps/food/views.py
@@ -135,7 +135,7 @@ def pic_upload(request, id):
     form = UploadImageForm(request.POST, request.FILES)
     if form.is_valid():
         try:
-            food = SingleFood.objects.get(food=id)
+            food = SingleFood.objects.get(id=id)
             food.image.clear
             old_user_pic = UserFoodImage.objects.get(user=request.user, food=id)
             old_user_pic.delete()