diff --git a/core/src/main/java/hudson/model/User.java b/core/src/main/java/hudson/model/User.java
index b1b4f41f57..84eebf84b0 100644
--- a/core/src/main/java/hudson/model/User.java
+++ b/core/src/main/java/hudson/model/User.java
@@ -452,9 +452,9 @@ public class User extends AbstractModelObject implements AccessControlled, Savea
                 } else {
                     p = d.newInstance(req, o);
                 }
+                p.setUser(this);
             }
 
-            p.setUser(this);
             props.add(p);
         }
         this.properties = props;