diff --git a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
index d50a1d234..236ce08a6 100644
--- a/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
+++ b/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java
@@ -141,17 +141,13 @@ public class AnnotationFields extends AnnotationParser {
       prop.setSqlFormula(formula.select(), formula.join());
     }
 
-    initWhoCreated(prop);
-    initWhoModified(prop);
+    initWhoProperties(prop);
   }
 
-  private void initWhoModified(DeployBeanProperty prop) {
+  private void initWhoProperties(DeployBeanProperty prop) {
     if (get(prop, WhoModified.class) != null) {
       generatedPropFactory.setWhoModified(prop);
     }
-  }
-
-  private void initWhoCreated(DeployBeanProperty prop) {
     if (get(prop, WhoCreated.class) != null) {
       generatedPropFactory.setWhoCreated(prop);
     }
@@ -297,8 +293,7 @@ public class AnnotationFields extends AnnotationParser {
       generatedPropFactory.setUpdateTimestamp(prop);
     }
 
-    initWhoCreated(prop);
-    initWhoModified(prop);
+    initWhoProperties(prop);
 
     if (get(prop, HistoryExclude.class) != null) {
       prop.setExcludedFromHistory();