diff --git a/files/routes/asset_submissions.py b/files/routes/asset_submissions.py
index af035584d..a5208a4c0 100644
--- a/files/routes/asset_submissions.py
+++ b/files/routes/asset_submissions.py
@@ -325,7 +325,6 @@ if SITE not in ('pcmemes.net', 'watchpeopledie.tv'):
 
 		return {"message": f"'{hat.name}' approved!"}
 
-
 	@app.post("/remove/hat/<name>")
 	@auth_required
 	def remove_hat(v, name):
@@ -342,9 +341,10 @@ if SITE not in ('pcmemes.net', 'watchpeopledie.tv'):
 		if name:
 			marsey = g.db.get(Marsey, name)
 			if marsey:
-				tags = marsey.tags
+				tags = marsey.tags or ''
 			else:
-				name = None
+				name = ''
+				tags = ''
 				error = "A marsey with this name doesn't exist!"
 		return render_template("update_assets.html", v=v, error=error, name=name, tags=tags, type="Marsey")
 
@@ -391,7 +391,7 @@ if SITE not in ('pcmemes.net', 'watchpeopledie.tv'):
 			process_image(filename, resize=200, trim=True)
 			purge_files_in_cache([f"https://{SITE}/e/{name}.webp", f"https://{SITE}/assets/images/emojis/{name}.webp", f"https://{SITE}/asset_submissions/marseys/original/{name}.{format}"])
 		
-		if tags and existing.tags != tags:
+		if tags and existing.tags != tags and tags != "None":
 			existing.tags = tags
 			g.db.add(existing)
 		elif not file:
@@ -403,7 +403,6 @@ if SITE not in ('pcmemes.net', 'watchpeopledie.tv'):
 			_note=f'<a href="/e/{name}.webp">{name}</a>'
 		)
 		g.db.add(ma)
-
 		return render_template("update_assets.html", v=v, msg=f"'{name}' updated successfully!", name=name, tags=tags, type="Marsey")
 
 	@app.get("/admin/update/hats")
@@ -467,5 +466,4 @@ if SITE not in ('pcmemes.net', 'watchpeopledie.tv'):
 			_note=f'<a href="/i/hats/{name}.webp">{name}</a>'
 		)
 		g.db.add(ma)
-
 		return render_template("update_assets.html", v=v, msg=f"'{name}' updated successfully!", type="Hat")
diff --git a/files/templates/update_assets.html b/files/templates/update_assets.html
index 88e0247b1..c27b16807 100644
--- a/files/templates/update_assets.html
+++ b/files/templates/update_assets.html
@@ -1,11 +1,8 @@
 {% extends "default.html" %}
-
 {% block title %}
 <title>Update {{type}}</title>
 {% endblock %}
-
 {% block pagetype %}message{% endblock %}
-
 {% block content %}
 	{% if error %}
 		<div class="alert alert-danger alert-dismissible fade show mb-3 mt-4" role="alert">
@@ -49,11 +46,11 @@
 							</div>
 
 							<label class="mt-3" for="name">Name</label>
-							<input autocomplete="off" type="text" id="name" class="form-control" name="name" maxlength="30" placeholder="Required" required>
+							<input autocomplete="off" type="text" id="name" class="form-control" name="name" maxlength="30" placeholder="Required" value="{{name}}" required>
 
 							{% if type == "Marsey" %}
 							<label class="mt-3" for="tags">Tags</label>
-							<input autocomplete="off" type="text" id="name" class="form-control" name="tags" maxlength="200" placeholder="Leave empty to keep current tags">
+							<input autocomplete="off" type="text" id="name" class="form-control" name="tags" maxlength="200" placeholder="Leave empty to keep current tags" value="{{tags}}">
 							{% endif %}
 							<div class="footer mt-4">
 								<div class="d-flex">