diff --git a/gradle/changelog/automask.yaml b/gradle/changelog/automask.yaml
new file mode 100644
index 0000000000..4de872e4c2
--- /dev/null
+++ b/gradle/changelog/automask.yaml
@@ -0,0 +1,2 @@
+- type: added
+  description: Fields can now get automatically masked, if the field name contains certain phrases
diff --git a/scm-core/src/main/java/sonia/scm/auditlog/AuditEntry.java b/scm-core/src/main/java/sonia/scm/auditlog/AuditEntry.java
index 985fbe6c31..ba30110fd5 100644
--- a/scm-core/src/main/java/sonia/scm/auditlog/AuditEntry.java
+++ b/scm-core/src/main/java/sonia/scm/auditlog/AuditEntry.java
@@ -38,4 +38,5 @@ public @interface AuditEntry {
   String[] maskedFields() default {};
   String[] ignoredFields() default {};
   boolean ignore() default false;
+  boolean autoMask() default true;
 }