diff --git a/app/display/model/src/main/java/org/csstudio/display/builder/model/persist/ModelWriter.java b/app/display/model/src/main/java/org/csstudio/display/builder/model/persist/ModelWriter.java
index da615bfa43..d87710ebe4 100644
--- a/app/display/model/src/main/java/org/csstudio/display/builder/model/persist/ModelWriter.java
+++ b/app/display/model/src/main/java/org/csstudio/display/builder/model/persist/ModelWriter.java
@@ -83,7 +83,8 @@ public ModelWriter(final OutputStream stream) throws Exception
         writer = new IndentingXMLStreamWriter(base);
 
         writer.writeStartDocument(XMLUtil.ENCODING, "1.0");
-        writer.writeComment("Saved on " + TimestampFormats.SECONDS_FORMAT.format(Instant.now()) + " by " + System.getProperty("user.name"));
+        if (with_comments)
+            writer.writeComment("Created " + TimestampFormats.DATETIME_FORMAT.format(Instant.now()));
         writer.writeStartElement(XMLTags.DISPLAY);
         writer.writeAttribute(XMLTags.VERSION, DisplayModel.VERSION.toString());
     }