diff --git a/files/helpers/const.py b/files/helpers/const.py
index 14e413d03a..04f4575eca 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -36,6 +36,7 @@ AJ_REPLACEMENTS = {
 }
 
 SLURS = {
+	"white": "mayo",
 	"retarded": "r-slurred",
 	"retard": "r-slur",
 	"tard": "r-slur",
diff --git a/files/routes/login.py b/files/routes/login.py
index e7dd017c7f..547381366e 100644
--- a/files/routes/login.py
+++ b/files/routes/login.py
@@ -284,10 +284,7 @@ def sign_up_post(v):
 	if existing_account and existing_account.reserved:
 		return redirect(existing_account.url)
 
-	if existing_account or (email and g.db.query(
-			User).filter(User.email.ilike(email)).first()):
-		return new_signup(
-			"An account with that username or email already exists.")
+	if existing_account: return new_signup("An account with that username already exists.")
 
 	if app.config.get("HCAPTCHA_SITEKEY"):
 		token = request.values.get("h-captcha-response")
diff --git a/files/templates/submission.html b/files/templates/submission.html
index a3a8489f25..366355adea 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -316,10 +316,6 @@
 				<ul class="list-group post-actions">
 					<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#reportPostModal" onclick="report_postModal('{{p.id}}')"><i class="far fa-flag text-center text-muted mr-3"></i>Report</button>
 					
-					{% if v and (v.id==p.author_id or v.admin_level > 1 and v.admin_level > 2) %}
-						<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-dismiss="modal" onclick="togglePostEdit('{{p.id}}')"><i class="far fa-edit text-center text-muted mr-3"></i>Edit</button>
-					{% endif %}
-
 					{% if v and v.id==p.author_id %}
 						{% if p.private %}
 							<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" href="javascript:void(0)" onclick="post_toast('/publish/{{p.id}}')" data-bs-dismiss="modal"><i class="fas fa-globe text-center text-muted mr-3"></i>Publish</button>
@@ -337,6 +333,10 @@
 
 					<a class="btn-block" href="/votes?link={{p.fullname}}"><button class="nobackground btn btn-link btn-block btn-lg text-left text-muted"><i class="fas fa-arrows-v text-center text-muted mr-3"></i>Votes</button></a>
 
+					{% if v and (v.id==p.author_id or v.admin_level > 1 and v.admin_level > 2) %}
+						<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-dismiss="modal" onclick="togglePostEdit('{{p.id}}')"><i class="far fa-edit text-center text-muted mr-3"></i>Edit</button>
+					{% endif %}
+
 					{% if v %}
 						<button class="nobackground btn btn-link btn-block btn-lg text-left text-muted" data-bs-toggle="modal" data-bs-dismiss="modal" data-bs-target="#awardModal" onclick="awardModal('/post/{{p.id}}/awards')"><i class="fas fa-gift text-center text-muted mr-3"></i>Give Award</button>
 					{% endif %}