diff --git a/files/classes/user.py b/files/classes/user.py
index 3125ea98f..058b7a0c4 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -1047,6 +1047,9 @@ class User(Base):
@property
@lazy
def profile_url(self):
+ if self.username.startswith('deleted~') and not (g.v and g.v.admin_level >= PERMS['VIEW_DELETED_ACCOUNTS']):
+ return f"{SITE_FULL_IMAGES}/i/default-profile-pic.webp?x=14"
+
if IS_HOMOWEEN() and self.zombie < 0:
random.seed(self.id)
zombie_num = random.randint(1, 10)
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 74c7a72be..552a90a0d 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -188,19 +188,22 @@
{% if c.ghost %}
👻
{% else %}
- {% if c.author.switched.flag %}
-
- {% endif %}
+ {% if not (c.author.username.startswith('deleted~') and not (v and v.admin_level >= PERMS['VIEW_DELETED_ACCOUNTS'])) %}
+ {% if c.author.switched.flag %}
+
+ {% endif %}
- {% if FEATURES['PATRON_ICONS'] and c.author.switched.patron > 1 and c.author.switched.lifetimedonated_visible %}
-
- {% endif %}
+ {% if FEATURES['PATRON_ICONS'] and c.author.switched.patron > 1 and c.author.switched.lifetimedonated_visible %}
+
+ {% endif %}
- {% if FEATURES['HOUSES'] and c.author.switched.house %}
-
- {% endif %}
+ {% if FEATURES['HOUSES'] and c.author.switched.house %}
+
+ {% endif %}
- {% if c.author.switched.verified %}
+ {% if c.author.switched.verified %}
+
+ {% endif %}
{% endif %}
@@ -212,11 +215,14 @@
{{c.author_name}}
- {% if FEATURES['PRONOUNS'] and c.author.switched.pronouns %}
- {{c.author.switched.pronouns_display}}
- {% endif %}
- {% if c.author.switched.flair_html %}
- {{c.author.switched.flair_html | safe}}
+
+ {% if not (c.author.username.startswith('deleted~') and not (v and v.admin_level >= PERMS['VIEW_DELETED_ACCOUNTS'])) %}
+ {% if FEATURES['PRONOUNS'] and c.author.switched.pronouns %}
+ {{c.author.switched.pronouns_display}}
+ {% endif %}
+ {% if c.author.switched.flair_html %}
+ {{c.author.switched.flair_html | safe}}
+ {% endif %}
{% endif %}
{% endif %}
diff --git a/files/templates/util/macros.html b/files/templates/util/macros.html
index 917400a32..6dc588e87 100644
--- a/files/templates/util/macros.html
+++ b/files/templates/util/macros.html
@@ -92,20 +92,24 @@
{% if p.ghost %}
👻
{% else %}
- {% if p.author.switched.flag %}
-
+ {% if not (p.author.username.startswith('deleted~') and not (v and v.admin_level >= PERMS['VIEW_DELETED_ACCOUNTS'])) %}
+ {% if p.author.switched.flag %}
+
+ {% endif %}
+
+ {% if FEATURES['PATRON_ICONS'] and p.author.switched.patron > 1 and p.author.switched.lifetimedonated_visible %}
+
+ {% endif %}
+
+ {% if FEATURES['HOUSES'] and p.author.switched.house %}
+
+ {% endif %}
+
+ {% if p.author.switched.verified %}
+
+ {% endif %}
{% endif %}
- {% if FEATURES['PATRON_ICONS'] and p.author.switched.patron > 1 and p.author.switched.lifetimedonated_visible %}
-
- {% endif %}
-
- {% if FEATURES['HOUSES'] and p.author.switched.house %}
-
- {% endif %}
-
- {% if p.author.switched.verified %}
- {% endif %}
@@ -115,11 +119,14 @@
{{p.author_name}}
- {% if FEATURES['PRONOUNS'] and p.author.switched.pronouns %}
- {{p.author.switched.pronouns_display}}
- {% endif %}
- {% if p.author.switched.flair_html %}
- {{p.author.switched.flair_html | safe}}
+
+ {% if not (p.author.username.startswith('deleted~') and not (v and v.admin_level >= PERMS['VIEW_DELETED_ACCOUNTS'])) %}
+ {% if FEATURES['PRONOUNS'] and p.author.switched.pronouns %}
+ {{p.author.switched.pronouns_display}}
+ {% endif %}
+ {% if p.author.switched.flair_html %}
+ {{p.author.switched.flair_html | safe}}
+ {% endif %}
{% endif %}
{% endif %}
{{p.age_string}}