diff --git a/files/helpers/media.py b/files/helpers/media.py
index db856d8af..976789226 100644
--- a/files/helpers/media.py
+++ b/files/helpers/media.py
@@ -112,7 +112,7 @@ def process_video(file):
 
 
 
-def process_image(filename=None, resize=0, trim=False, patron=False):
+def process_image(filename=None, resize=0, trim=False, uploader=None, patron=False):
 	size = os.stat(filename).st_size
 
 	if size > 16 * 1024 * 1024 or not patron and size > 8 * 1024 * 1024:
@@ -177,7 +177,7 @@ def process_image(filename=None, resize=0, trim=False, patron=False):
 	media = Media(
 		kind='image',
 		filename=filename.split('/')[-1],
-		user_id=g.v.id,
+		user_id=uploader or g.v.id,
 		size=os.stat(filename).st_size
 	)
 	g.db.add(media)
diff --git a/files/routes/posts.py b/files/routes/posts.py
index 09b50bfc5..9dbb81c1d 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -598,7 +598,7 @@ def thumbnail_thread(pid):
 		for chunk in image_req.iter_content(1024):
 			file.write(chunk)
 
-	post.thumburl = process_image(name, resize=100)
+	post.thumburl = process_image(name, resize=100, uploader=post.author_id)
 	db.add(post)
 	db.commit()
 	db.close()