diff --git a/frappe/hooks.py b/frappe/hooks.py
index 8fb7903db7..536d9e2610 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -295,7 +295,7 @@ otp_methods = ['OTP App','Email','SMS']
 user_data_fields = [
 	{"doctype": "Access Log", "strict": True},
 	{"doctype": "Activity Log", "strict": True},
-	{"doctype": "Comment"},
+	{"doctype": "Comment", "strict": True},
 	{
 		"doctype": "Contact",
 		"filter_by": "email_id",
diff --git a/frappe/website/doctype/personal_data_deletion_request/personal_data_deletion_request.json b/frappe/website/doctype/personal_data_deletion_request/personal_data_deletion_request.json
index 122c06240c..e1439fd2dc 100644
--- a/frappe/website/doctype/personal_data_deletion_request/personal_data_deletion_request.json
+++ b/frappe/website/doctype/personal_data_deletion_request/personal_data_deletion_request.json
@@ -1,6 +1,5 @@
 {
  "actions": [],
- "autoname": "format:deleted-user-{####}@deleted.com",
  "creation": "2019-02-12 15:11:52.201733",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -31,7 +30,7 @@
   }
  ],
  "links": [],
- "modified": "2021-02-26 00:11:22.434940",
+ "modified": "2021-02-28 12:36:08.219719",
  "modified_by": "Administrator",
  "module": "Website",
  "name": "Personal Data Deletion Request",
diff --git a/frappe/website/doctype/personal_data_deletion_request/personal_data_deletion_request.py b/frappe/website/doctype/personal_data_deletion_request/personal_data_deletion_request.py
index a1a7208249..95ce50693f 100644
--- a/frappe/website/doctype/personal_data_deletion_request/personal_data_deletion_request.py
+++ b/frappe/website/doctype/personal_data_deletion_request/personal_data_deletion_request.py
@@ -24,6 +24,11 @@ class PersonalDataDeletionRequest(Document):
 			x for x in self.user_data_fields if x.get("partial") or not x.get("redact_fields")
 		]
 
+	def autoname(self):
+		from frappe.model.naming import set_name_from_naming_options
+		autoname = f"format:deleted-user-{{####}}@{frappe.local.site}"
+		set_name_from_naming_options(autoname, self)
+
 	def after_insert(self):
 		self.send_verification_mail()
 
@@ -86,8 +91,8 @@ class PersonalDataDeletionRequest(Document):
 		self.is_full_name_set = email != self.full_name
 
 		self.anonymization_value_map = {
-			"Code": "REDACTED: Removed due to Personal Data Deletion Request",
-			"Data": "REDACTED",
+			"Code": "[REDACTED]: Removed due to Personal Data Deletion Request",
+			"Data": "[REDACTED]",
 			"Date": "1111-01-01",
 			"Email": self.anon,
 			"Int": 0,