Merge "Fix several issues with precreated users."