diff --git a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java
index 02e970140..fa4153526 100644
--- a/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java
+++ b/src/main/java/io/ebeaninternal/server/persist/dmlbind/FactoryAssocOnes.java
@@ -41,10 +41,15 @@ public class FactoryAssocOnes {
           // typically generated 'who' created/modified properties
           switch (mode) {
             case INSERT:
-              list.add(new BindableAssocOneGeneratedInsert(one));
+              if (one.getGeneratedProperty().includeInInsert()) {
+                list.add(new BindableAssocOneGeneratedInsert(one));
+              }
               break;
             case UPDATE:
-              list.add(new BindableAssocOneGeneratedUpdate(one));
+              if (one.getGeneratedProperty().includeInUpdate()) {
+                // A 'Who Created property' is never updated
+                list.add(new BindableAssocOneGeneratedUpdate(one));
+              }
               break;
           }
         }