diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec1aaeb2..a40b3a49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,20 @@
 # CHANGELOG
 
+## v24.39
+
+### Pre-releases
+- v24.39-alpha1
+
+### Fix
+- Fix credentials custom data editing (#424, `v24.39-alpha1`)
+
+---
+
+
 ## v24.36
 
 ### Pre-releases
+- v24.36-beta
 - v24.36-alpha5
 - v24.36-alpha4
 - v24.36-alpha3
diff --git a/seacatauth/credentials/schemas.py b/seacatauth/credentials/schemas.py
index 3ae26560..64680f57 100644
--- a/seacatauth/credentials/schemas.py
+++ b/seacatauth/credentials/schemas.py
@@ -26,14 +26,14 @@
 	"data": {
 		"type": "object",
 		"description": "Custom data",
-		# "patternProperties": {
-		# 	"^[a-zA-Z][a-zA-Z0-9_-]{0,126}[a-zA-Z0-9]$": {"anyOf": [
-		# 		{"type": "string"},
-		# 		{"type": "number"},
-		# 		{"type": "boolean"},
-		# 		{"type": "null"},
-		# 	]}
-		# },
+		"patternProperties": {
+			"^[a-zA-Z][a-zA-Z0-9_-]{0,126}[a-zA-Z0-9]$": {"anyOf": [
+				{"type": "string"},
+				{"type": "number"},
+				{"type": "boolean"},
+				{"type": "null"},
+			]}
+		},
 		"additionalProperties": False,
 	},
 	"suspended": {