diff --git a/files/routes/admin.py b/files/routes/admin.py
index ed265b0bc..9ed53f65b 100644
--- a/files/routes/admin.py
+++ b/files/routes/admin.py
@@ -621,7 +621,7 @@ def badge_grant_post(v):
 	try: badge_id = int(request.values.get("badge_id"))
 	except: abort(400)
 
-	if badge_id in {94,95,96,97,98,109}: abort(403)
+	if badge_id in {16,17,94,95,96,97,98,109}: abort(403)
 
 	if user.has_badge(badge_id):
 		return render_template("admin/badge_grant.html", v=v, badge_types=badges, error="User already has that badge.")
diff --git a/files/routes/comments.py b/files/routes/comments.py
index 98372e9ab..d571d7d3a 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -273,20 +273,51 @@ def api_comment(v):
 							if not marsey_regex2.fullmatch(name):
 								return {"error": "Invalid name!"}, 403
 
-							if "author" in marsey: author_id = get_user(marsey["author"]).id
-							elif "author_id" in marsey: author_id = int(marsey["author_id"])
+							if "author" in marsey: user = get_user(marsey["author"])
+							elif "author_id" in marsey: user = get_account(marsey["author_id"])
 							else: abort(400)
 
 							existing = g.db.query(Marsey.name).filter_by(name=name).one_or_none()
 							if existing: return {"error": "A marsey with this name already exists!"}, 403
 
-							marsey = Marsey(name=marsey["name"], author_id=author_id, tags=marsey["tags"], count=0)
+							marsey = Marsey(name=marsey["name"], author_id=user.id, tags=marsey["tags"], count=0)
 							g.db.add(marsey)
 							filename = f'files/assets/images/emojis/{name}.webp'
 							copyfile(oldname, filename)
 							process_image(filename, 200)
+
+
+							all_by_author = g.db.query(Marsey.author_id).filter_by(author_id=user.id).count()
+
+							if all_by_author >= 10 and not user.has_badge(16):
+								new_badge = Badge(badge_id=16, user_id=user.id)
+
+								g.db.add(new_badge)
+								g.db.flush()
+
+								if v.id != user.id:
+									text = f"@AutoJanny has given you the following profile badge:\n\n![]({new_badge.path})\n\n{new_badge.name}"
+									send_notification(user.id, text)
+
+								old_badge = user.has_badge(17)
+								if badge: g.db.delete(badge)
+
+
+							if all_by_author < 10 and not user.has_badge(17):
+								new_badge = Badge(badge_id=17, user_id=user.id)
+
+								g.db.add(new_badge)
+								g.db.flush()
+
+								if v.id != user.id:
+									text = f"@AutoJanny has given you the following profile badge:\n\n![]({new_badge.path})\n\n{new_badge.name}"
+									send_notification(user.id, text)
+
+
+
 							requests.post(f'https://api.cloudflare.com/client/v4/zones/{CF_ZONE}/purge_cache', headers=CF_HEADERS, data={'files': [f"https://{request.host}/e/{name}.webp"]}, timeout=5)
 							cache.delete_memoized(marsey_list)
+
 						except Exception as e:
 							return {"error": str(e)}, 400
 				body += f"\n\n![]({image})"