diff --git a/files/classes/comment.py b/files/classes/comment.py
index 4601ad2d1..792379ec2 100644
--- a/files/classes/comment.py
+++ b/files/classes/comment.py
@@ -383,7 +383,7 @@ class Comment(Base):
 			body += f'''><label class="custom-control-label" for="comment-{o.id}">{o.body_html} - 
 			<a href="/votes/comment/option/{o.id}"><span id="score-comment-{o.id}">{o.upvotes}</span> votes</a></label></div>'''
 
-		if self.author.sig_html and (self.author_id == MOOSE_ID or (not self.ghost and not (v and (v.sigs_disabled or v.poor)))):
+		if not self.ghost and self.author.show_sig(v):
 			body += f"<hr>{self.author.sig_html}"
 
 		return body
diff --git a/files/classes/submission.py b/files/classes/submission.py
index f82fec74b..656840254 100644
--- a/files/classes/submission.py
+++ b/files/classes/submission.py
@@ -396,8 +396,7 @@ class Submission(Base):
 				<a href="/votes/post/option/{o.id}"><span id="score-post-{o.id}">{o.upvotes}</span> votes</a></label></div>'''
 
 
-
-		if not listing and self.author.sig_html and (self.author_id == MOOSE_ID or (not self.ghost and not (v and (v.sigs_disabled or v.poor)))):
+		if not listing and not self.ghost and self.author.show_sig(v):
 			body += f"<hr>{self.author.sig_html}"
 
 		return body
diff --git a/files/classes/user.py b/files/classes/user.py
index 9931e718a..406780131 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -935,3 +935,16 @@ class User(Base):
 		from_casino_value = from_casino or 0
 
 		return from_casino_value + self.total_lottery_winnings
+
+	@lazy
+	def show_sig(self, v):
+		if not self.author.sig_html:
+			return False
+
+		if not self.author.patron and SITE_NAME != 'WPD':
+			return False
+
+		if v and (v.sigs_disabled or v.poor):
+			return False
+
+		return True
\ No newline at end of file
diff --git a/files/helpers/const.py b/files/helpers/const.py
index b461328b5..9a8427c35 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -188,7 +188,6 @@ PIZZA_VOTERS = ()
 IDIO_ID = 0
 CARP_ID = 0
 JOAN_ID = 0
-MOOSE_ID = 0
 AEVANN_ID = 0
 SNAKES_ID = 0
 HOMO_ID = 0
@@ -242,7 +241,6 @@ if SITE == 'rdrama.net':
 	IDIO_ID = 30
 	CARP_ID = 995
 	JOAN_ID = 28
-	MOOSE_ID = 1904
 	AEVANN_ID = 1
 	SNAKES_ID = 10288
 	HOMO_ID = 147
diff --git a/files/helpers/jinja2.py b/files/helpers/jinja2.py
index 719f1c6ba..e6d70e0bf 100644
--- a/files/helpers/jinja2.py
+++ b/files/helpers/jinja2.py
@@ -51,7 +51,7 @@ def timestamp(timestamp):
 def inject_constants():
 	return {"environ":environ, "SITE":SITE, "SITE_NAME":SITE_NAME, "SITE_FULL":SITE_FULL,
 			"AUTOJANNY_ID":AUTOJANNY_ID, "PUSHER_ID":PUSHER_ID, 
-			"CC":CC, "CC_TITLE":CC_TITLE, "listdir":listdir, "MOOSE_ID":MOOSE_ID, "AEVANN_ID":AEVANN_ID, 
+			"CC":CC, "CC_TITLE":CC_TITLE, "listdir":listdir, "AEVANN_ID":AEVANN_ID, 
 			"PIZZASHILL_ID":PIZZASHILL_ID, "DEFAULT_COLOR":DEFAULT_COLOR, 
 			"COLORS":COLORS, "time":time, "PERMS":PERMS, "FEATURES":FEATURES,
 			"HOLE_NAME":HOLE_NAME, "HOLE_STYLE_FLAIR":HOLE_STYLE_FLAIR, "HOLE_REQUIRED":HOLE_REQUIRED,
diff --git a/files/routes/settings.py b/files/routes/settings.py
index cb94d13c5..faae241b1 100644
--- a/files/routes/settings.py
+++ b/files/routes/settings.py
@@ -129,7 +129,7 @@ def settings_profile_post(v):
 		g.db.add(v)
 		return render_template("settings_profile.html", v=v, msg="Your enemies list has been updated.")
 
-	elif (v.patron or v.id == MOOSE_ID) and request.values.get("sig"):
+	elif v.patron and request.values.get("sig"):
 		sig = request.values.get("sig")[:200].replace('\n','').replace('\r','')
 
 		sig_html = sanitize(sig)