Merge "Fix locking error when a new user is created"