Merge "UserManager: move preCreate code to new method"